modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat
| 46 ---------
modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
| 48 ----------
modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
| 13 +-
modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
| 16 +++
modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
| 14 --
5 files changed, 26 insertions(+), 111 deletions(-)
New commits:
commit 1dc50f9ee3b7aa9c0e60419ff83d1de52387e9c9
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Thu May 2 10:42:08 2013 -0400
Dev-container work
- remove rhq-autoinstall.sh|bat and its use
We no longer autoinstall the server in the dev container. Instead we
treat it a little more like production and to install and initially start
your dev container you should 'rhqctl install'.
- Lower the windows dev-container mem for rhq-server and rhq-storage (cassandra)\
by limiting the mem allocated to the Java Service Wrapper. (via
the wrapper .inc). For linux this will be done (for cassandra at least)
via a dev config file, using soon-to-exist option to do that.
diff --git
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat
deleted file mode 100644
index 8ebcd63..0000000
--- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.bat
+++ /dev/null
@@ -1,46 +0,0 @@
-@echo off
-setlocal
-
-set RHQ_SERVER_BIN_DIR_PATH=%~dp0
-if not defined RHQ_SERVER_HOME (
- cd "%RHQ_SERVER_BIN_DIR_PATH%\.."
-) else (
- cd "%RHQ_SERVER_HOME%" || (
- echo Cannot go to the RHQ_SERVER_HOME directory: %RHQ_SERVER_HOME%
- exit /B 1
- )
-)
-set RHQ_SERVER_HOME=%CD%
-cd %RHQ_SERVER_HOME%\bin
-
-set _INSTALLER_SCRIPT=%RHQ_SERVER_HOME%\bin\rhq-installer.bat
-set RHQ_CCM_SCRIPT=%RHQ_SERVER_HOME%\bin\rhq-ccm.bat
-
-echo Installing embedded Cassandra cluster...
-CALL "%RHQ_CCM_SCRIPT% deploy"
-
-
-rem we are normally executed just before the server starts, so give it time to
initialize
-rem yes, this is a sleep of 5s, backwards compatible to XP
-ping 127.0.0.1 -n 5 -w 1000 > nul
-
-for /L %%i in (1,1,2) do (
- echo Running Installer Now...
- CALL "%_INSTALLER_SCRIPT%"
- if ERRORLEVEL 2 (
- echo Installer failed - will try again in a few seconds
- ping 127.0.0.1 -n 5 -w 1000 > nul
- ) else (
- if ERRORLEVEL 1 (
- echo The installer has been disabled - please fix rhq-server.properties
- goto :done
- ) else (
- echo Installer finished
- goto :done
- )
- )
-)
-echo Aborting installation - installer failed.
-
-:done
-endlocal
diff --git
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
deleted file mode 100755
index 0a241f6..0000000
--- a/modules/enterprise/server/appserver/src/main/dev-resources/bin/rhq-autoinstall.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-if [ -z ${RHQ_SERVER_HOME} ]; then
- echo RHQ_SERVER_HOME not defined
- exit 1
-fi
-
-cd "$RHQ_SERVER_HOME"
-RHQ_SERVER_HOME=`pwd`
-
-_INSTALLER_SCRIPT="${RHQ_SERVER_HOME}/bin/rhq-installer.sh"
-_CCM_SCRIPT="${RHQ_SERVER_HOME}/bin/rhq-ccm.sh"
-_JBOSS_CLI_SCRIPT="${RHQ_SERVER_HOME}/jbossas/bin/jboss-cli.sh"
-_ROPERTY_SET_MARKER="/tmp/.cassandra.seeds.set"
-
-# we are normally executed just before the server starts, so give it time to initialize
-sleep 5
-
-echo Installing embedded Cassandra cluster...
-eval ${_CCM_SCRIPT} deploy
-
-if [ ! -e ${_ROPERTY_SET_MARKER} ]; then
- echo Updating the rhq.cassandra.seeds property...
- #jboss-cli needs to have clear JAVA_OPTS
- JAVA_OPTS_BACKUP=$JAVA_OPTS
- export JAVA_OPTS=""
- SEEDS=`cat ${RHQ_SERVER_HOME}/bin/rhq-server.properties | sed -ne 's/,/;/g' -e
's/rhq.cassandra.seeds=//gp'`
- ${_JBOSS_CLI_SCRIPT} --connect controller=localhost:6999
/system-property=rhq.cassandra.seeds/:add\(value="$SEEDS"\)
- export JAVA_OPTS=$JAVA_OPTS_BACKUP
- touch ${_ROPERTY_SET_MARKER}
-fi
-
-_TRIES="1 2"
-for _TRY in $_TRIES
-do
- echo Running Installer Now...
- eval ${_INSTALLER_SCRIPT}
- if [ "$?" -eq "0" ]; then
- echo Installer finished
- # most times, the installation was already done, but see if changes to
rhq-server.properties requires a reconfiguration
- eval ${_INSTALLER_SCRIPT} --reconfig
- break;
- elif [ "$?" -eq "1" ]; then
- echo The installer has been disabled - please fix rhq-server.properties
- break;
- else
- echo Installer exited with failure code "$?" - will try again in a few
seconds
- sleep 5
- fi
-done
diff --git
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
index b76cd2f..a7207b1 100644
---
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
+++
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
@@ -1,15 +1,20 @@
#
-# Additional dev-only options for the RHQ Server Java Service Wrapper. Numbering should
at N+1 where N is the
-# last wrapper.java.additional.N entry in rhq-agent-wrapper.conf.
+# Additional dev-only options for the RHQ Server Java Service Wrapper. Numbering should
start at N+1 where N is the
+# last wrapper.java.additional.N entry in rhq-server-wrapper.conf.
#
# enable remote debugging
wrapper.java.additional.9=-agentlib:jdwp=transport=dt_socket,address=8787,server=y,suspend=n
+# override and lower the initial memory profile
+wrapper.java.additional.10=-Xms256M
+wrapper.java.additional.11=-Xmx512M
+wrapper.java.additional.12=-XX:PermSize=128M
+wrapper.java.additional.13=-XX:MaxPermSize=128M
# enable jprofiler
#set.PATH=%PATH%;<jprofiler-install-dir>\bin\windows
-#wrapper.java.additional.10=-agentlib:jprofilerti=port=8849
-#wrapper.java.additional.11=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
+#wrapper.java.additional.14=-agentlib:jprofilerti=port=8849
+#wrapper.java.additional.15=-Xbootclasspath/a:<jprofiler-install-dir>\bin\agent.jar
# disable JVM startup timeout
wrapper.startup.timeout=0
diff --git
a/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
new file mode 100644
index 0000000..ee0d448
--- /dev/null
+++
b/modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-storage-wrapper.inc
@@ -0,0 +1,16 @@
+#
+# Additional dev-only options for the RHQ Storage Java Service Wrapper. Numbering should
start at N+1 where N is the
+# last wrapper.java.additional.N entry in rhq-storage-wrapper.conf.
+#
+
+# override and lower the initial memory profile
+wrapper.java.additional.18=-Xms128M
+wrapper.java.additional.19=-Xmx256M
+
+# enable remote debugging
+#wrapper.java.additional.20=-agentlib:jdwp=transport=dt_socket,address=8788,server=y,suspend=n
+
+# disable JVM startup timeout
+wrapper.startup.timeout=0
+# disable JVM ping timeout
+wrapper.ping.timeout=0
diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
index 945e2c9..b3e8239 100644
--- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
+++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
@@ -776,19 +776,7 @@ rhq.cassandra.cluster.num-nodes=${rhq.cassandra.cluster.num-nodes}
# The log4j logging level to use on each node.
rhq.cassandra.logging.level=${rhq.cassandra.logging.level}
</echo>
- <replace
file="${project.build.outputDirectory}/bin/rhq-server.sh">
- <replacefilter>
- <replacetoken># START SERVER</replacetoken>
- <replacevalue><![CDATA[export RHQ_SERVER_HOME;
${RHQ_SERVER_HOME}/bin/rhq-autoinstall.sh &]]></replacevalue>
- </replacefilter>
- </replace>
- <replace
file="${project.build.outputDirectory}/bin/rhq-server.bat">
- <replacefilter>
- <replacetoken>rem START SERVER</replacetoken>
- <replacevalue><![CDATA[start /B
%RHQ_SERVER_HOME%\bin\rhq-autoinstall.bat < nul > nul]]></replacevalue>
- </replacefilter>
- </replace>
-
+
<echo>Adding RHQ Cassandra CCM CLI module to ${jboss.modules.dir}
...</echo>
<unzip
src="${settings.localRepository}/org/rhq/rhq-cassandra-ccm-cli/${project.version}/rhq-cassandra-ccm-cli-${project.version}.zip"
dest="${jboss.modules.dir}" />
Show replies by date