incubator-olio-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shee...@apache.org
Subject svn commit: r807800 - in /incubator/olio/workload/php/trunk: deploy/run.xml src/org/apache/olio/workload/harness/OlioBenchmark.java
Date Tue, 25 Aug 2009 20:56:47 GMT
Author: sheetal
Date: Tue Aug 25 20:56:47 2009
New Revision: 807800

URL: http://svn.apache.org/viewvc?rev=807800&view=rev
Log:
OLIO#113 for php-driver

Modified:
    incubator/olio/workload/php/trunk/deploy/run.xml
    incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java

Modified: incubator/olio/workload/php/trunk/deploy/run.xml
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/deploy/run.xml?rev=807800&r1=807799&r2=807800&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/deploy/run.xml (original)
+++ incubator/olio/workload/php/trunk/deploy/run.xml Tue Aug 25 20:56:47 2009
@@ -20,22 +20,22 @@
 
 <olio>
     <jvmConfig xmlns="http://faban.sunsource.net/ns/fabanharness">
-        <javaHome>/apps/JVMs/jdk1.6.0_03</javaHome>
-        <jvmOptions>-Xmx1g -Xms256m -XX:+DisableExplicitGC</jvmOptions>
+        <javaHome>/usr/java</javaHome>
+        <jvmOptions>-Xmx3g -Xms256m -XX:+DisableExplicitGC</jvmOptions>
     </jvmConfig>
     
     <fa:runConfig definition="org.apache.olio.workload.driver.UIDriver" xmlns="http://faban.sunsource.net/ns/fabandriver"
xmlns:fa="http://faban.sunsource.net/ns/faban" xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
         <fh:description>Enter description for this run here</fh:description>
         
         <fa:hostConfig>
-            <fa:host>dewberry</fa:host>
+            <fa:host>pae4150-8</fa:host>
             <fh:enabled>true</fh:enabled>
             <fh:cpus>0</fh:cpus>
             <fh:tools>vmstat 10</fh:tools>
             <fh:userCommands/>
         </fa:hostConfig>
         
-        <fa:scale>50</fa:scale>
+        <fa:scale>25</fa:scale>
         
         <fa:runControl>
             <fa:rampUp>30</fa:rampUp>
@@ -47,7 +47,7 @@
         
         <audit>false</audit>
         <threadStart>            
-            <delay>10</delay>            
+            <delay>100</delay>
             <simultaneous>false</simultaneous>            
             <parallel>false</parallel>
         </threadStart>
@@ -58,11 +58,11 @@
         </stats>
         
         <runtimeStats enabled="false">
-            <interval>5</interval>
+            <interval>25</interval>
         </runtimeStats>
         
         <driverConfig name="UIDriver">            
-            <agents>2</agents>            
+            <agents>1</agents>
             <stats>
                 <interval>30</interval>
             </stats>            
@@ -75,66 +75,75 @@
     
     <webServer>
         <fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness" xmlns:fa="http://faban.sunsource.net/ns/faban">
-            <fa:hostPorts>abhi:8080</fa:hostPorts>
+            <fa:hostPorts>pae2200-2:8080</fa:hostPorts>
             <enabled>true</enabled>
             <cpus>0</cpus>
-            <tools>vmstat 10; mpstat 10; netsum -a -i 10; nicstat 10; statit 10; dladm
show-aggr -s -i 5; ps -eo "pid pcpu time vsz rss nlwp args"; iostat -xn 10; cpustat</tools>
          
+            <tools>vmstat 10; mpstat 10; iostat -xn 10</tools>           
             <userCommands/>            
         </fa:hostConfig>
         <type>apache</type>
-        <hostBinPath>/opt/coolstack/apache2/bin</hostBinPath>
-        <hostLogPath>/opt/coolstack/apache2/logs</hostLogPath>
-        <hostConfPath>/opt/coolstack/apache2/conf</hostConfPath>
-        <phpIniPath>/opt/coolstack/php5/lib</phpIniPath>
+        <fh:service xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
+            <fh:name>ApacheHttpdService</fh:name>
+            <fh:tools>NONE</fh:tools>
+            <fh:restart>true</fh:restart>
+            <fh:config>
+                <cmdPath>/usr/apache2/2.2/bin/apachectl</cmdPath>
+                <logsDir>/var/apache2/2.2/logs</logsDir>
+             </fh:config>
+        </fh:service>
     </webServer>
     <dbServer>
         <fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness" xmlns:fa="http://faban.sunsource.net/ns/faban">
-            <fa:host>abhi</fa:host>
+            <fa:host>pae4250-03</fa:host>
             <enabled>true</enabled>
             <cpus>0</cpus>
-            <tools>vmstat 10; mpstat 10; netsum -a -i 10; nicstat 10; statit 10; dladm
show-aggr -s -i 5; ps -eo "pid pcpu time vsz rss nlwp args"; iostat -xn 10; cpustat</tools>
+            <tools></tools>
             <userCommands/>
         </fa:hostConfig>
-        <dbDriver>com.mysql.jdbc.Driver</dbDriver>
-        <connectURL>jdbc:mysql://localhost/olio?user=olio&amp;password=olio&amp;relaxAutoCommit=true&amp;sessionVariables=FOREIGN_KEY_CHECKS=0</connectURL>
+        <dbDriver>com.mysql.jdbc.Driver</dbDriver>        
+        <connectURL>jdbc:mysql://pae4250-03/olio?user=olio&amp;password=olio&amp;relaxAutoCommit=true&amp;sessionVariables=FOREIGN_KEY_CHECKS=0</connectURL>
         <autoCommit>true</autoCommit>
         <reloadDB>true</reloadDB>
-        <scale>2000</scale>
-        <dbHomePath>/opt/coolstack/mysql_32bit</dbHomePath>
+        <scale>500</scale>
         <dbConfPath>/etc</dbConfPath>
+        <fh:service xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
+            <fh:name>MySQLService</fh:name>
+            <fh:tools>Mysqlstats</fh:tools>
+            <fh:restart>true</fh:restart>
+            <fh:config>
+                <serverHome>/opt/coolstack/mysql</serverHome>
+                <user>olio</user>
+                <password>olio</password>
+             </fh:config>
+        </fh:service>
     </dbServer>
     <dataStorage>
-        <fa:hostConfig xmlns:fa="http://faban.sunsource.net/ns/faban"
-                       xmlns="http://faban.sunsource.net/ns/fabanharness">
-            <fa:host>abhi</fa:host>
+        <fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness" xmlns:fa="http://faban.sunsource.net/ns/faban">
+            <fa:host>pae2200-2</fa:host>
             <enabled>true</enabled>
             <cpus>0</cpus>
             <tools>NONE</tools>
             <userCommands></userCommands>
         </fa:hostConfig>
         <reloadMedia>false</reloadMedia>
-        <mediaDir>/filestore</mediaDir>
+        <mediaDir>/export/home/filestore</mediaDir>
     </dataStorage>
     <cacheServers>
         <fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness" xmlns:fa="http://faban.sunsource.net/ns/faban">
-            <fa:hostPorts>cacheHost:11212 cacheHost:11211</fa:hostPorts>
+            <fa:hostPorts>pae2200-2</fa:hostPorts>
             <enabled>true</enabled>
             <cpus>0</cpus>
             <tools>NONE</tools>
             <userCommands/>
         </fa:hostConfig>
-        <cacheBinPath>/opt/coolstack/bin</cacheBinPath>
+        <fh:service xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
+            <fh:name>MemcachedService</fh:name>
+            <fh:tools>MemcacheStats -i 10</fh:tools>
+            <fh:restart>true</fh:restart>
+            <fh:config>
+                <cmdPath>/usr/lib/memcached</cmdPath>
+                <serverMemSize>256</serverMemSize>
+             </fh:config>
+        </fh:service>
     </cacheServers>
-    <!-- Shanti - commenting as not used
-    <otherServers>
-        <fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness" xmlns:fa="http://faban.sunsource.net/ns/faban">
-            <fa:host></fa:host>
-            <enabled>true</enabled>
-            <cpus>0</cpus>
-            <tools>NONE</tools>
-            <userCommands/>
-        </fa:hostConfig>
-        <serverList></serverList>
-    </otherServers>
-    -->
 </olio>

Modified: incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
URL: http://svn.apache.org/viewvc/incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java?rev=807800&r1=807799&r2=807800&view=diff
==============================================================================
--- incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
(original)
+++ incubator/olio/workload/php/trunk/src/org/apache/olio/workload/harness/OlioBenchmark.java
Tue Aug 25 20:56:47 2009
@@ -48,12 +48,7 @@
     static Logger logger = Logger.getLogger(
                                         OlioBenchmark.class.getName());
     int totalRunningTimeInSecs = 0;
-    private List<NameValuePair<Integer>> memcacheServers;
-    private String webServerBinPath, webServerLogPath, webServerConfPath;
-    private String webServerPidPath, phpIniPath, cacheBinPath, dbConfPath;
-    WebServerService webServerService;
-    MemcachedService memcachedService = MemcachedService.getHandle();
-
+    
     /**
      * This method is called to configure the specific benchmark run
      * Tasks done in this method include reading user parameters,
@@ -66,56 +61,9 @@
         params = getParamRepository();
 
         //Obtaining configuration parameters
-        String webserverType = params.getParameter("webServer/type");
- 
-        webServerBinPath = params.getParameter("webServer/hostBinPath");
-        webServerLogPath = params.getParameter("webServer/hostLogPath");
-        webServerConfPath = params.getParameter("webServer/hostConfPath");
-        webServerPidPath = params.getParameter("webServer/hostPidPath");
-        phpIniPath = params.getParameter("webServer/phpIniPath");
-        cacheBinPath = params.getParameter("cacheServers/cacheBinPath");
-        dbConfPath = params.getParameter("dbServer/dbConfPath");
         String[] dbhosts = params.getParameter(
                             "dbServer/fa:hostConfig/fa:host").split(" ");
-        String[] webhosts = params.getParameter(
-                            "webServer/fa:hostConfig/fa:host").split(" ");
-
-        if ("apache".equals(webserverType)) {
-            webServerService = ApacheHttpdService.getHandle();
-            for (String webhost : webhosts) {
-                RunContext.getFile(webhost, webServerConfPath +
-                        File.separator + "httpd.conf", RunContext.getOutDir() +
-                        "httpd_conf.log." + getHostName(webhost));
-            }
-        } else if ("lighttpd".equals(webserverType)) {
-            webServerService = LighttpdService.getHandle();
-            for (String webhost : webhosts) {
-                RunContext.getFile(webhost, webServerConfPath +
-                        File.separator + "lighttpd.conf",
-                        RunContext.getOutDir() + "lighttpd_conf.log." +
-                        getHostName(webhost));
-            }
-        } else if ("glassfish".equals(webserverType)) {
-            webServerService = GlassfishService.getHandle();
-            for (String webhost : webhosts) {
-                RunContext.getFile(webhost, webServerConfPath +
-                        File.separator + "domain.xml",
-                        RunContext.getOutDir() + "domain_xml.log." +
-                        getHostName(webhost));
-            }
-        }
-        if (phpIniPath != null && phpIniPath.length() > 0)
-            for (String webhost : webhosts) {
-                RunContext.getFile(webhost, phpIniPath + "/php.ini",
-                        RunContext.getOutDir() + "php_ini.log." +
-                        getHostName(webhost));
-            }
-
-        for (String dbhost : dbhosts) {
-            RunContext.getFile(dbhost, dbConfPath + "/my.cnf",
-            RunContext.getOutDir() + "my_cnf.log." + getHostName(dbhost));
-        }
-
+        
         // Reloading database and media as necessary.
         boolean reloadDB = Boolean.parseBoolean(
                 params.getParameter("dbServer/reloadDB"));
@@ -175,36 +123,6 @@
 			if (exitValue != 0)
 				throw (new Exception("File load error, exited with value " + exitValue));
 		}
-        
-        //start the memcache servers
-        memcacheServers =
-                 params.getHostPorts("cacheServers/fa:hostConfig/fa:hostPorts");
-
-         // Assign the default port.
-         for (NameValuePair<Integer> hostPort : memcacheServers) {
-             if (hostPort.value == null)
-                 hostPort.value = 11211;
-         }
-
-        int index = 0;
-        String memServers[] = new String[memcacheServers.size()];
-        int ports[] = new int[memcacheServers.size()];
-        for (NameValuePair<Integer> thisCacheServer : memcacheServers) {
-            memServers[index] = thisCacheServer.name;
-            ports[index++] = thisCacheServer.value;
-        } 
-        memcachedService.setup(memServers, ports, "-u mysql -m 256",
-                cacheBinPath);
-        if ( !memcachedService.restartServers())
-            throw (new Exception("Memcached server(s) restart failed"));
-        
-        // Now start the web servers
-        if (webServerService != null) {
-            webServerService.setup(webhosts, webServerBinPath, webServerLogPath,
-                                    webServerConfPath, webServerPidPath);
-            if (!webServerService.restartServers())
-                throw (new Exception("Webserver(s) restart failed"));
-        }
 
         //calculate total running time, including rampUp, steadyState,
         // and rampDown
@@ -227,27 +145,13 @@
     public void end () throws Exception {
      
         super.end();
-        //stop the memcached servers
-        //logger.info("Stopping Memcached servers");
-        //memcachedService.stopServers();
-
-        if (webServerService != null) {
-            // xfer logs
-            logger.info("Transferring webserver error logs");
-            webServerService.xferLogs(totalRunningTimeInSecs);
-
-            // stop web servers
-            logger.info("Stopping web servers");
-            webServerService.stopServers();
-        }
+        
     }
 
     /* Override DefaultBenchmark's kill method to stop the servers.
      */
     public void kill() throws Exception {
-        memcachedService.stopServers();
-        if (webServerService != null)
-            webServerService.kill();
+       
         super.kill();
     }
 }



Mime
View raw message