You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/05/04 14:25:17 UTC
[1/2] git commit: updated refs/heads/master to b828654
Repository: cloudstack
Updated Branches:
refs/heads/master c7d1b8142 -> b8286548b
Cloudstack Usage Breaks if DB HA enabled
With DB HA enabled in db.properties, the cloudstack-usage service restarts every 10 seconds. Making the suggested change has fixed it for me. Cloudstack 4.8 on Centos7
Update cloudstack-usage.service
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6089d898
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6089d898
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6089d898
Branch: refs/heads/master
Commit: 6089d898d9ab7a6cdf59e2c89a579b1271049ed2
Parents: d705d85
Author: Slair1 <sl...@ippathways.com>
Authored: Wed Mar 9 12:06:03 2016 -0600
Committer: Slair1 <sl...@ippathways.com>
Committed: Thu Apr 7 19:45:18 2016 -0500
----------------------------------------------------------------------
packaging/systemd/cloudstack-usage.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6089d898/packaging/systemd/cloudstack-usage.service
----------------------------------------------------------------------
diff --git a/packaging/systemd/cloudstack-usage.service b/packaging/systemd/cloudstack-usage.service
index 9a1827d..c37f32c 100644
--- a/packaging/systemd/cloudstack-usage.service
+++ b/packaging/systemd/cloudstack-usage.service
@@ -28,7 +28,7 @@ Environment=JAVA_HEAP_INITIAL=256m
Environment=JAVA_HEAP_MAX=2048m
Environment=JAVA_CLASS=com.cloud.usage.UsageServer
ExecStart=/bin/sh -ec '\
- export UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar /usr/share/cloudstack-usage/lib/*.jar | tr "\\n" ":"`; \
+ export UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar /usr/share/cloudstack-usage/lib/*.jar /usr/share/cloudstack-mysql-ha/lib/*.jar | tr "\\n" ":"`; \
export CLASSPATH="$UCP:/etc/cloudstack/usage:/usr/share/java/mysql-connector-java.jar"; \
${JAVA_HOME}/bin/java -Xms${JAVA_HEAP_INITIAL} -Xmx${JAVA_HEAP_MAX} -cp "$CLASSPATH" $JAVA_CLASS'
Restart=always
[2/2] git commit: updated refs/heads/master to b828654
Posted by sw...@apache.org.
Merge pull request #1433 from Slair1/patch-1
CLOUDSTACK-9305: Cloudstack Usage Breaks if DB HA enabledWith DB HA enabled in db.properties, the cloudstack-usage service restarts every 10 seconds. Making the suggested change has fixed it for me. Cloudstack 4.8 on Centos7
* pr/1433:
Cloudstack Usage Breaks if DB HA enabled
Signed-off-by: Will Stevens <wi...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b8286548
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b8286548
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b8286548
Branch: refs/heads/master
Commit: b8286548b12e114d18501b97200bb3889bda31e5
Parents: c7d1b81 6089d89
Author: Will Stevens <wi...@gmail.com>
Authored: Wed May 4 10:24:52 2016 -0400
Committer: Will Stevens <wi...@gmail.com>
Committed: Wed May 4 10:24:52 2016 -0400
----------------------------------------------------------------------
packaging/systemd/cloudstack-usage.service | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b8286548/packaging/systemd/cloudstack-usage.service
----------------------------------------------------------------------
diff --cc packaging/systemd/cloudstack-usage.service
index d80aba6,c37f32c..641d125
--- a/packaging/systemd/cloudstack-usage.service
+++ b/packaging/systemd/cloudstack-usage.service
@@@ -27,11 -27,10 +27,11 @@@ Environment=JAVA_HOME=/usr/lib/jvm/jr
Environment=JAVA_HEAP_INITIAL=256m
Environment=JAVA_HEAP_MAX=2048m
Environment=JAVA_CLASS=com.cloud.usage.UsageServer
+Environment=JAVA_PID=$$
ExecStart=/bin/sh -ec '\
- export UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar /usr/share/cloudstack-usage/lib/*.jar | tr "\\n" ":"`; \
+ export UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar /usr/share/cloudstack-usage/lib/*.jar /usr/share/cloudstack-mysql-ha/lib/*.jar | tr "\\n" ":"`; \
export CLASSPATH="$UCP:/etc/cloudstack/usage:/usr/share/java/mysql-connector-java.jar"; \
- ${JAVA_HOME}/bin/java -Xms${JAVA_HEAP_INITIAL} -Xmx${JAVA_HEAP_MAX} -cp "$CLASSPATH" $JAVA_CLASS'
+ ${JAVA_HOME}/bin/java -Dpid=${JAVA_PID} -Xms${JAVA_HEAP_INITIAL} -Xmx${JAVA_HEAP_MAX} -cp "$CLASSPATH" $JAVA_CLASS'
Restart=always
RestartSec=10s