[Hyperic-hq-discuss] hq r14305 - in trunk/tools/agentpork: . etc

[<kp...@hy...>]

Author: kparikh
Date: 2010-02-18 09:42:01 -0800 (Thu, 18 Feb 2010)
New Revision: 14305
URL: http://svn.hyperic.org/?view=rev&root=Hyperic+HQ&revision=14305

Modified:
   trunk/tools/agentpork/create_clone.sh
   trunk/tools/agentpork/etc/agent.properties
   trunk/tools/agentpork/etc/multiagent.properties
   trunk/tools/agentpork/start_multiagent.sh
   trunk/tools/agentpork/stop_clone.sh
Log:
Fix multiagent stop issue
Add plugin.exclude props

Modified: trunk/tools/agentpork/create_clone.sh
===================================================================
--- trunk/tools/agentpork/create_clone.sh	2010-02-18 09:22:36 UTC (rev 14304)
+++ trunk/tools/agentpork/create_clone.sh	2010-02-18 17:42:01 UTC (rev 14305)
@@ -20,8 +20,10 @@
 	sed -e s/@CLONE_SERVERIP@/$CLONE_SERVERIP/       | \
 	sed -e s/@CLONE_SECURE@/$CLONE_SECURE/           | \
 	sed -e s/@CLONE_FQDN@/${CLONE_FQDN_PREFIX}$1/    | \
+    sed -e s/@CLONE_SERVER_PORT@/$CLONE_SERVER_PORT/ | \
 	sed -e s/@CLONE_LISTENPORT@/${clone_port}/ \
 > clones/clone_$1/agent.properties
 
 cd clones/clone_$1
 nohup ./hq-agent-nowrapper.sh start 2>&1 > console.out & 
+echo $! > nowrapper.pid
\ No newline at end of file

Modified: trunk/tools/agentpork/etc/agent.properties
===================================================================
--- trunk/tools/agentpork/etc/agent.properties	2010-02-18 09:22:36 UTC (rev 14304)
+++ trunk/tools/agentpork/etc/agent.properties	2010-02-18 17:42:01 UTC (rev 14305)
@@ -79,3 +79,9 @@
 ## Options to pass to java
 agent.javaOpts=-Xmx128m -Djava.net.preferIPv4Stack=true
 agent.setup.unidirectional=no
+
+# Setting plugin.base allows us exclude netservices and sqlquery plugins
+plugins.base=system
+
+# exclude all plugins except system and hq-agent
+plugins.exclude=activemq,alfresco,apache,bind,coldfusion,db2,dotnet,exchange,geronimo,glassfish,hq-internal,hq-inventory,iis,informix,iplanet,jboss,jetty,jmx,jvm-jmx-metrics,memcached,mqseries,mssql,multi-process-metrics,mysql,mysql_stats,nagios,netdevice,netservices,ntds,ntp,oc4j,openldap,oracle,perlbal,postfix,postgresql,resin,samba,sendmail,servlet,spring,sqlquery,sun-jvm-service,sybase,tomcat,vim,vmware,weblogic,websphere,xen,zimbra,groovy-scripting

Modified: trunk/tools/agentpork/etc/multiagent.properties
===================================================================
--- trunk/tools/agentpork/etc/multiagent.properties	2010-02-18 09:22:36 UTC (rev 14304)
+++ trunk/tools/agentpork/etc/multiagent.properties	2010-02-18 17:42:01 UTC (rev 14305)
@@ -1,14 +1,37 @@
-# Adjust following variables based on your config
-export AGENT_HOME=/x2/HQ/multiagent/trimmed-agent
+# Update following variables based on your environment and needs
+
+# Full path to hq agent home
+export AGENT_HOME=$HQ_AGENT_HOME
+
+# Agent build version
 export AGENT_BUILD_VERSION=4.2.0
+
+# Agent build number
 export AGENT_BUILD_NUMBER=1261
-export CLONE_SERVERIP=10.16.17.38
-export CLONE_SERVER_PORT=8080
+
+# HQ server IP
+export CLONE_SERVERIP=127.0.0.1
+
+# HQ server port
+export CLONE_SERVER_PORT=7080
+
+# First port the agent should listen on
+# If you set NUM_CLONES to 10, agents will listen on following ports 
+# 4000, 4001, 4002,..., 4009
 export CLONE_LISTEN_STARTPORT=4000
-export NUM_CLONES=100
-export CLONE_JAVA_FLAGS="-XX:MaxPermSize=128m -Xmx1024m -Xms1024m"
 
+# Number of agents you want to start
+export NUM_CLONES=10
 
+# Recommended settings are
+# If NUM_CLONES=10 then -Xmx128m -Xms128m
+# If NUM_CLONES=25 then -Xmx256m -Xms256m
+# If NUM_CLONES=50 then -Xmx512m -Xms512m
+# If NUM_CLONES=100 then -Xmx1024m -Xms1024m
+# Leave MaxPermSize to 128m
+export CLONE_JAVA_FLAGS="-XX:MaxPermSize=128m -Xmx128m -Xms128m"
+
+
 # Do not modify anything below
 export CLONE_SECURE=yes
 export AGENT_BUNDLE_HOME=$AGENT_HOME/bundles/agent-$AGENT_BUILD_VERSION-EE-$AGENT_BUILD_NUMBER
@@ -29,4 +52,3 @@
 CLONE_CP=$AGENT_HOME/wrapper/lib/wrapper.jar:$CLONE_CP
 export CLONE_CP=$CLONE_CP
 export CLONE_FQDN_PREFIX=$HOSTNAME-clone-
-

Modified: trunk/tools/agentpork/start_multiagent.sh
===================================================================
--- trunk/tools/agentpork/start_multiagent.sh	2010-02-18 09:22:36 UTC (rev 14304)
+++ trunk/tools/agentpork/start_multiagent.sh	2010-02-18 17:42:01 UTC (rev 14305)
@@ -9,7 +9,7 @@
         -Dagent.mode=thread \
         -Djava.security.auth.login.config=jaas.config \
         -Djava.net.preferIPv4Stack=true \
-	-Dcom.sun.management.jmxremote \
+        -Dcom.sun.management.jmxremote \
         $CLONE_JAVA_FLAGS \
         -cp $CLONE_CP org.hyperic.util.thread.MultiRunner $1"
 

Modified: trunk/tools/agentpork/stop_clone.sh
===================================================================
--- trunk/tools/agentpork/stop_clone.sh	2010-02-18 09:22:36 UTC (rev 14304)
+++ trunk/tools/agentpork/stop_clone.sh	2010-02-18 17:42:01 UTC (rev 14305)
@@ -3,4 +3,11 @@
 . etc/multiagent.properties
 
 cd clones/clone_$1
+# Stop the agent
 ./hq-agent-nowrapper.sh stop
+
+# Cleanup in case agent nohup process is still running
+# kill child process forked by hq-agent-nowrapper.sh
+# This matches the java process and send it sighup, it also kills hq-agent-nowrapiper.sh
+ps -o pid= --ppid `cat nowrapper.pid`|  xargs kill
+rm nowrapper.pid