Repository: cloudstack Updated Branches: refs/heads/4.5 e474454c9 -> e9ce0df5d
CLOUDSTACK-7316: usage server cannot start due to missing key in /etc/cloudstack/usage/ in Ubuntu setup (cherry picked from commit 6fb9746e5eeacadc10b7d0977b03959683058b33) Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e9ce0df5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e9ce0df5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e9ce0df5 Branch: refs/heads/4.5 Commit: e9ce0df5d8a7173132b356040d036118a4612e39 Parents: e474454 Author: Wei Zhou <[email protected]> Authored: Mon Dec 15 09:22:52 2014 +0100 Committer: Rohit Yadav <[email protected]> Committed: Tue Jan 27 17:39:22 2015 +0530 ---------------------------------------------------------------------- debian/cloudstack-usage.postinst | 6 ++++++ engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9ce0df5/debian/cloudstack-usage.postinst ---------------------------------------------------------------------- diff --git a/debian/cloudstack-usage.postinst b/debian/cloudstack-usage.postinst index fa8650c..8a475c4 100644 --- a/debian/cloudstack-usage.postinst +++ b/debian/cloudstack-usage.postinst @@ -37,6 +37,12 @@ case "$1" in if [ -f "/etc/cloud/usage/log4j-cloud.xml" ]; then cp -a /etc/cloud/usage/log4j-cloud.xml /etc/cloudstack/usage/log4j-cloud.xml fi + + # Replacing key with management server key + if [ -f "/etc/cloudstack/management/key" ]; then + rm -rf /etc/cloudstack/usage/key + ln -s /etc/cloudstack/management/key /etc/cloudstack/usage/key + fi ;; esac http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9ce0df5/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java index 3e75930..4491c67 100644 --- a/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java +++ b/engine/schema/src/com/cloud/usage/dao/UsageVmDiskDaoImpl.java @@ -35,7 +35,7 @@ import com.cloud.utils.exception.CloudRuntimeException; @Component @Local(value = {UsageVmDiskDao.class}) public class UsageVmDiskDaoImpl extends GenericDaoBase<UsageVmDiskVO, Long> implements UsageVmDiskDao { - private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName()); + private static final Logger s_logger = Logger.getLogger(UsageVmDiskDaoImpl.class.getName()); private static final String SELECT_LATEST_STATS = "SELECT uvd.account_id, uvd.zone_id, uvd.vm_id, uvd.volume_id, uvd.io_read, uvd.io_write, uvd.agg_io_read, uvd.agg_io_write, " + "uvd.bytes_read, uvd.bytes_write, uvd.agg_bytes_read, uvd.agg_bytes_write, uvd.event_time_millis "
