KAA-500: set default values for JAVA_OPTIONS in service scripts

kaaproject · May 12, 2015 · f77a803 · f77a803
1 parent 8dba70f
commit f77a803
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 10 deletions.
diff --git a/server/admin/src/main/sh/bin/kaa-admin.default b/server/admin/src/main/sh/bin/kaa-admin.default
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Extra options to pass to the JVM
-JAVA_OPTIONS="-Xms256M -Xmx1G -XX:+UseG1GC -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=256M"
-SERVER_LOG_SUFIX=
+# Default options to pass to the JVM
+JAVA_OPTIONS="-Xms128M -Xmx128m -XX:+UseG1GC -XX:+CMSClassUnloadingEnabled -XX:+CMSPermGenSweepingEnabled -XX:MaxPermSize=128M"
+SERVER_LOG_SUFIX=
diff --git a/server/admin/src/main/sh/init.d/deb/kaa-admin.init.d b/server/admin/src/main/sh/init.d/deb/kaa-admin.init.d
@@ -52,7 +52,7 @@ SERVER_SHUTDOWN_TIMEOUT=${SERVER_SHUTDOWN_TIMEOUT:-60}
 LOCKFILE="${SERVER_LOCK_DIR}/${NAME}"
 desc="$DESC daemon"
 EXEC_PATH=/usr/bin/$NAME
-JAVA_OPTIONS="-Xmx256m"
+JAVA_OPTIONS=""
 
 STATUS_RUNNING=0
 STATUS_DEAD=1
@@ -69,8 +69,14 @@ fi
 . /lib/lsb/init-functions
 
 
+# Load default options, if any
 if [ -f "$DEFAULT" ]; then
+    CURRENT_JAVA_OPTIONS=$JAVA_OPTIONS
     . "$DEFAULT"
+    # Current options are considered to be more specific,
+    # so they are overriding defaults
+    JAVA_OPTIONS="$JAVA_OPTIONS $CURRENT_JAVA_OPTIONS"
+    export JAVA_OPTIONS
 fi
 
 if [ -z $SERVER_LOG_SUFIX ]; then

diff --git a/server/admin/src/main/sh/init.d/rpm/kaa-admin.init.d b/server/admin/src/main/sh/init.d/rpm/kaa-admin.init.d
@@ -52,7 +52,7 @@ SERVER_SHUTDOWN_TIMEOUT=${SERVER_SHUTDOWN_TIMEOUT:-60}
 LOCKFILE="${SERVER_LOCK_DIR}/${NAME}"
 desc="$DESC daemon"
 EXEC_PATH=/usr/bin/$NAME
-JAVA_OPTIONS="-Xmx256m"
+JAVA_OPTIONS=""
 
 STATUS_RUNNING=0
 STATUS_DEAD=1
@@ -69,8 +69,14 @@ fi
 . /etc/rc.d/init.d/functions
 
 
+# Load default options, if any
 if [ -f "$DEFAULT" ]; then
+    CURRENT_JAVA_OPTIONS=$JAVA_OPTIONS
     . "$DEFAULT"
+    # Current options are considered to be more specific,
+    # so they are overriding defaults
+    JAVA_OPTIONS="$JAVA_OPTIONS $CURRENT_JAVA_OPTIONS"
+    export JAVA_OPTIONS
 fi
 
 if [ -z $SERVER_LOG_SUFIX ]; then

diff --git a/server/bootstrap/pom.xml b/server/bootstrap/pom.xml
@@ -36,6 +36,7 @@
         <server.confname>bootstrap-server.properties</server.confname>
         <script.server.name>kaa-bootstrap</script.server.name>
         <script.server.desc>Kaa Bootstrap Server</script.server.desc>
+        <script.java.options>-Xmx128M -XX:MaxPermSize=64M</script.java.options>
     </properties>
 
     <dependencies>
@@ -317,12 +318,19 @@
                                 <replace
                                     file="tmp_sh/init.d/deb/${script.server.name}.init.d"
                                     token="#serverdesc#" value="${script.server.desc}" />
+                                <replace
+                                    file="tmp_sh/init.d/deb/${script.server.name}.init.d"
+                                    token="#javaopts#" value="${script.java.options}"  />
                                 <replace
                                     file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
                                     token="#servername#" value="${script.server.name}" />
                                 <replace
                                     file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
                                     token="#serverdesc#" value="${script.server.desc}" />
+                                <replace
+                                    file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
+                                    token="#javaopts#" value="${script.java.options}"  />
+
 
                             </tasks>
                         </configuration>

diff --git a/server/common/src/sh/bin/kaa-server.default b/server/common/src/sh/bin/kaa-server.default
@@ -13,6 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Extra options to pass to the JVM
-JAVA_OPTIONS="-Xms256M -Xmx4G -XX:+UseG1GC"
+# Default options to pass to the JVM
+JAVA_OPTIONS="-Xms128M -XX:+UseG1GC"
 SERVER_LOG_SUFIX=
diff --git a/server/common/src/sh/init.d/deb/kaa-server.init.d b/server/common/src/sh/init.d/deb/kaa-server.init.d
@@ -51,7 +51,7 @@ SERVER_SHUTDOWN_TIMEOUT=${SERVER_SHUTDOWN_TIMEOUT:-60}
 LOCKFILE="${SERVER_LOCK_DIR}/${NAME}"
 desc="$DESC daemon"
 EXEC_PATH=/usr/bin/$NAME
-JAVA_OPTIONS="-Xmx256m"
+JAVA_OPTIONS="#javaopts#"
 
 STATUS_RUNNING=0
 STATUS_DEAD=1
@@ -67,9 +67,14 @@ fi
 
 . /lib/lsb/init-functions
 
-
+# Load default options, if any
 if [ -f "$DEFAULT" ]; then
+    CURRENT_JAVA_OPTIONS=$JAVA_OPTIONS
     . "$DEFAULT"
+    # Current options are considered to be more specific,
+    # so they are overriding defaults
+    JAVA_OPTIONS="$JAVA_OPTIONS $CURRENT_JAVA_OPTIONS"
+    export JAVA_OPTIONS
 fi
 
 if [ -z $SERVER_LOG_SUFIX ]; then

diff --git a/server/common/src/sh/init.d/rpm/kaa-server.init.d b/server/common/src/sh/init.d/rpm/kaa-server.init.d
@@ -51,7 +51,7 @@ SERVER_SHUTDOWN_TIMEOUT=${SERVER_SHUTDOWN_TIMEOUT:-60}
 LOCKFILE="${SERVER_LOCK_DIR}/${NAME}"
 desc="$DESC daemon"
 EXEC_PATH=/usr/bin/$NAME
-JAVA_OPTIONS="-Xmx256m"
+JAVA_OPTIONS="#javaopts#"
 
 STATUS_RUNNING=0
 STATUS_DEAD=1
@@ -67,8 +67,14 @@ fi
 
 . /etc/rc.d/init.d/functions
 
+# Load default options, if any
 if [ -f "$DEFAULT" ]; then
+    CURRENT_JAVA_OPTIONS=$JAVA_OPTIONS
     . "$DEFAULT"
+    # Current options are considered to be more specific,
+    # so they are overriding defaults
+    JAVA_OPTIONS="$JAVA_OPTIONS $CURRENT_JAVA_OPTIONS"
+    export JAVA_OPTIONS
 fi
 
 if [ -z $SERVER_LOG_SUFIX ]; then

diff --git a/server/control/pom.xml b/server/control/pom.xml
@@ -37,6 +37,7 @@
         <script.server.desc>Kaa Control Server</script.server.desc>
         <script.server.additional.commands>|api [args]</script.server.additional.commands>
         <sdk.path>${project.build.directory}/sdk</sdk.path>
+        <script.java.options>-Xmx128M -XX:MaxPermSize=64M</script.java.options>
     </properties>
     <dependencies>
         <dependency>
@@ -468,6 +469,9 @@
                                 <replace
                                     file="tmp_sh/init.d/deb/${script.server.name}.init.d"
                                     token="#servername#" value="${script.server.name}" />
+                                <replace
+                                    file="tmp_sh/init.d/deb/${script.server.name}.init.d"
+                                    token="#javaopts#" value="${script.java.options}"  />
                                 <replace
                                     file="tmp_sh/init.d/deb/${script.server.name}.init.d"
                                     token="#serverdesc#" value="${script.server.desc}" />
@@ -477,6 +481,9 @@
                                 <replace
                                     file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
                                     token="#serverdesc#" value="${script.server.desc}" />
+                                <replace
+                                    file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
+                                    token="#javaopts#" value="${script.java.options}"  />
                             </tasks>
                         </configuration>
                     </execution>

diff --git a/server/operations/pom.xml b/server/operations/pom.xml
@@ -36,6 +36,7 @@
         <script.server.name>kaa-operations</script.server.name>
         <script.server.desc>Kaa Operations Server</script.server.desc>
         <script.server.additional.commands></script.server.additional.commands>
+        <script.java.options>-Xmx128M -XX:MaxPermSize=64M</script.java.options>
     </properties>
 
     <dependencies>
@@ -444,12 +445,18 @@
                                 <replace
                                     file="tmp_sh/init.d/deb/${script.server.name}.init.d"
                                     token="#serverdesc#" value="${script.server.desc}" />
+                                <replace
+                                    file="tmp_sh/init.d/deb/${script.server.name}.init.d"
+                                    token="#javaopts#" value="${script.java.options}"  />
                                 <replace
                                     file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
                                     token="#servername#" value="${script.server.name}" />
                                 <replace
                                     file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
                                     token="#serverdesc#" value="${script.server.desc}" />
+                                <replace
+                                    file="tmp_sh/init.d/rpm/${script.server.name}.init.d"
+                                    token="#javaopts#" value="${script.java.options}"  />
 
                             </tasks>
                         </configuration>