Updated Branches: refs/heads/object_store 1e21b0b0e -> 4e4112fce
fix attach volume for kvm Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e4112fc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e4112fc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e4112fc Branch: refs/heads/object_store Commit: 4e4112fcecc4f2791ec99b774f81988f8c416d77 Parents: 1e21b0b Author: Edison Su <[email protected]> Authored: Thu May 23 13:51:14 2013 -0700 Committer: Edison Su <[email protected]> Committed: Thu May 23 13:51:46 2013 -0700 ---------------------------------------------------------------------- developer/pom.xml | 3 ++- .../src/com/cloud/upgrade/DatabaseCreator.java | 7 +++++++ .../kvm/storage/KVMStorageProcessor.java | 4 ++-- .../com/cloud/server/ConfigurationServerImpl.java | 15 +++++++++++++-- 4 files changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e4112fc/developer/pom.xml ---------------------------------------------------------------------- diff --git a/developer/pom.xml b/developer/pom.xml index 3dc276a..c02ef16 100644 --- a/developer/pom.xml +++ b/developer/pom.xml @@ -156,6 +156,7 @@ <argument>${basedir}/target/db/cloudbridge_offering_alter.sql</argument> <!-- Seed the database --> <argument>${basedir}/developer-prefill.sql</argument> + <argument>${basedir}/developer-prefill.sql.override</argument> <!-- Do database upgrade--> <argument>com.cloud.upgrade.DatabaseUpgradeChecker</argument> <argument>--database=cloud,usage,awsapi</argument> @@ -232,4 +233,4 @@ </build> </profile> </profiles> -</project> \ No newline at end of file +</project> http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e4112fc/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java b/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java index 9b1be6b..c97085b 100755 --- a/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java +++ b/engine/schema/src/com/cloud/upgrade/DatabaseCreator.java @@ -147,6 +147,13 @@ public class DatabaseCreator { databases = arg.substring(arg.lastIndexOf("=") + 1, arg.length()).split(","); } else if (arg.endsWith(".sql")) { sqlFiles.add(arg); + } else if (arg.endsWith(".sql.override")) { + if (fileExists(arg)) { + int index = arg.lastIndexOf(".override"); + String fileToOverride = arg.substring(0, index); + sqlFiles.remove(fileToOverride); + sqlFiles.add(arg); + } } else if (arg.endsWith(".properties")) { if (!dbPropsFile.endsWith("properties.override") && fileExists(arg)) dbPropsFile = arg; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e4112fc/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java index 53a9308..a03ac69 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java @@ -680,7 +680,7 @@ public class KVMStorageProcessor implements StorageProcessor { DiskTO disk = cmd.getDisk(); VolumeObjectTO vol = (VolumeObjectTO)disk.getData(); PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)vol.getDataStore(); - String vmName = vol.getVmName(); + String vmName = cmd.getVmName(); try { Connect conn = LibvirtConnection.getConnectionByVmName(vmName); KVMStoragePool primary = storagePoolMgr.getStoragePool( @@ -714,7 +714,7 @@ public class KVMStorageProcessor implements StorageProcessor { DiskTO disk = cmd.getDisk(); VolumeObjectTO vol = (VolumeObjectTO)disk.getData(); PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)vol.getDataStore(); - String vmName = vol.getVmName(); + String vmName = cmd.getVmName(); try { Connect conn = LibvirtConnection.getConnectionByVmName(vmName); KVMStoragePool primary = storagePoolMgr.getStoragePool( http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e4112fc/server/src/com/cloud/server/ConfigurationServerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index bc52e9a..98f1c96 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -224,9 +224,20 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } String hostIpAdr = NetUtils.getDefaultHostIp(); + boolean needUpdateHostIp = true; if (hostIpAdr != null) { - _configDao.update(Config.ManagementHostIPAdr.key(), Config.ManagementHostIPAdr.getCategory(), hostIpAdr); - s_logger.debug("ConfigurationServer saved \"" + hostIpAdr + "\" as host."); + Boolean devel = Boolean.valueOf(_configDao.getValue("developer")); + if (devel) { + String value = _configDao.getValue(Config.ManagementHostIPAdr.key()); + if (value != null) { + needUpdateHostIp = false; + } + } + + if (needUpdateHostIp) { + _configDao.update(Config.ManagementHostIPAdr.key(), Config.ManagementHostIPAdr.getCategory(), hostIpAdr); + s_logger.debug("ConfigurationServer saved \"" + hostIpAdr + "\" as host."); + } } // generate a single sign-on key
