Skip to content

systemd: Fix -Dpid arg passing to systemd usage service #3210

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
GabrielBrascher merged 3 commits into from
Mar 14, 2019
Merged

systemd: Fix -Dpid arg passing to systemd usage service #3210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e03187
systemd: Fix -Dpid arg passing to systemd usage service
yadvr Mar 12, 2019
8e5aec3
fix systemd limitation, exec using /bin/sh instead and wrap in ${} sy…
yadvr Mar 12, 2019
037ea19
usage: don't hide exception from Gabriel's https://github.com/apache/…
yadvr Mar 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packaging/systemd/cloudstack-usage.default
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,11 @@
# specific language governing permissions and limitations
# under the License.

JAVA_OPTS="-Dpid=$$ -Xms256m -Xmx2048m"
JAVA_OPTS="-Xms256m -Xmx2048m"

CLASSPATH="/usr/share/cloudstack-usage/*:/usr/share/cloudstack-usage/lib/*:/usr/share/cloudstack-mysql-ha/lib/*:/etc/cloudstack/usage:/usr/share/java/mysql-connector-java.jar"

JAVA_CLASS=com.cloud.usage.UsageServer

# Enable the following to enable remote socket based debugging:
#JAVA_DEBUG="-agentlib:jdwp=transport=dt_socket,address=8001,server=y,suspend=n"
3 changes: 2 additions & 1 deletion packaging/systemd/cloudstack-usage.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ After=network.target network-online.target
[Service]
Type=simple
EnvironmentFile=/etc/default/cloudstack-usage
ExecStart=/usr/bin/java $JAVA_OPTS -cp $CLASSPATH $JAVA_CLASS
Environment=JAVA_PID=$$
Copy link
Copy Markdown
Member Author

@yadvr yadvr Mar 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@GabrielBrascher @andrijapanic moved the JAVA_PID here so users can't change/mess it around. The systemd variable referencing is limiting, the fix was to use the ${VAR} syntax and not $VAR syntax. Can you believe it! https://www.freedesktop.org/software/systemd/man/systemd.service.html#Command%20lines

ExecStart=/bin/sh -ec '/usr/bin/java -Dpid=${JAVA_PID} $JAVA_OPTS $JAVA_DEBUG -cp $CLASSPATH $JAVA_CLASS'
Restart=always
RestartSec=10s

Expand Down
6 changes: 1 addition & 5 deletions usage/src/com/cloud/usage/UsageServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,7 @@ public void start() {

appContext = new ClassPathXmlApplicationContext("usageApplicationContext.xml");

try {
ComponentContext.initComponentsLifeCycle();
} catch (Exception e) {
e.printStackTrace();
}
ComponentContext.initComponentsLifeCycle();

mgr = appContext.getBean(UsageManager.class);

Expand Down