From 68d0b7735777db9312fae539bcd7fea3a33ea2f1 Mon Sep 17 00:00:00 2001 From: me Date: Fri, 24 Apr 2015 11:45:56 +0400 Subject: [PATCH] wsp-10329 Adding hyper-v replica to HyperV Provider. Minor fixes --- WebsitePanel/Database/update_db.sql | 2 ++ .../Helpers/MemoryHelper.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/WebsitePanel/Database/update_db.sql b/WebsitePanel/Database/update_db.sql index 9fa58a77..8e167745 100644 --- a/WebsitePanel/Database/update_db.sql +++ b/WebsitePanel/Database/update_db.sql @@ -8214,6 +8214,8 @@ AS WHERE SIP.PropertyName = 'RamSize' AND PT.ParentPackageID = @PackageID) DECLARE @Result2 int = (SELECT SUM(CAST(SIP.PropertyValue AS int)) FROM ServiceItemProperties AS SIP INNER JOIN ServiceItems AS SI ON SIP.ItemID = SI.ItemID + INNER JOIN ServiceItemProperties AS SIP2 ON + SIP2.ItemID = SI.ItemID AND SIP2.PropertyName = 'DynamicMemory.Enabled' AND SIP2.PropertyValue = 'True' INNER JOIN PackagesTreeCache AS PT ON SI.PackageID = PT.PackageID WHERE SIP.PropertyName = 'DynamicMemory.Maximum' AND PT.ParentPackageID = @PackageID) SET @Result = CASE WHEN isnull(@Result1,0) > isnull(@Result2,0) THEN @Result1 ELSE @Result2 END diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/MemoryHelper.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/MemoryHelper.cs index 035da473..688a7d42 100644 --- a/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/MemoryHelper.cs +++ b/WebsitePanel/Sources/WebsitePanel.Providers.Virtualization.HyperV-2012R2/Helpers/MemoryHelper.cs @@ -52,7 +52,7 @@ namespace WebsitePanel.Providers.Virtualization cmd.Parameters.Add("DynamicMemoryEnabled", false); } - powerShell.Execute(cmd, true); + powerShell.Execute(cmd, true, true); } } }