bigdata-commit

[Bigdata-commit] SF.net SVN: bigdata:[8218] branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/ resources/deployment/vagrant/systap-aws-bigdata-ha

[<dme...@us...>]

Revision: 8218
          http://sourceforge.net/p/bigdata/code/8218
Author:   dmekonnen
Date:     2014-05-07 14:53:21 +0000 (Wed, 07 May 2014)
Log Message:
-----------
validated resync with reboot elimination

Modified Paths:
--------------
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/setHosts.py
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/default_test.rb
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/jetty.xml.erb

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb	2014-05-07 14:17:24 UTC (rev 8217)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb	2014-05-07 14:53:21 UTC (rev 8218)
@@ -3,7 +3,8 @@
 default['systap-bigdataHA'][:bigdata_group] = "bigdata"
 
 # Where to find and build bigdata code
-default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/BIGDATA_RELEASE_1_3_0"
+# default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/BIGDATA_RELEASE_1_3_0"
+default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
 default['systap-bigdataHA'][:source]  = "/home/ubuntu/bigdata-code"
 
 # Name of the federation of services (controls the Apache River GROUPS).
@@ -18,6 +19,9 @@
 # Where the log files will live:
 default['systap-bigdataHA'][:log_dir]  = node['systap-bigdataHA'][:fed_dir] + "/log"
 
+# Where the jetty resourceBase is defined:
+default['systap-bigdataHA'][:jetty_dir]  = node['systap-bigdataHA'][:fed_dir] + "/var/jetty"
+
 # Name of the replication cluster to which this HAJournalServer will belong.
 default['systap-bigdataHA'][:logical_service_id] = 'HA-Replication-Cluster-1'
 

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/setHosts.py
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/setHosts.py	2014-05-07 14:17:24 UTC (rev 8217)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/bin/setHosts.py	2014-05-07 14:53:21 UTC (rev 8218)
@@ -87,9 +87,10 @@
 		# startHAServices does not exit as expected, so remote restart commands will hang.
 		# As a work around, we restart the host:
 		#
-		# status, stdin, stderr = ssh_client.run( "sudo /etc/init.d/bigdataHA restart" )
+		status, stdin, stderr = ssh_client.run( "sudo /etc/init.d/zookeeper-server restart" )
+		status, stdin, stderr = ssh_client.run( "sudo /etc/init.d/bigdataHA restart" )
 		# status, stdin, stderr = ssh_client.run( "sudo service bigdataHA restart" )
-		host.reboot()
+		# host.reboot()
 
 	print "The hosts are now rebooting, this may take several minutes. \nOnce back up, you may  confirm status by visiting:\n"
 	for host in bigdataHosts:

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/default_test.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/default_test.rb	2014-05-07 14:17:24 UTC (rev 8217)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/files/default/test/default_test.rb	2014-05-07 14:53:21 UTC (rev 8218)
@@ -1,6 +1,6 @@
 require 'minitest/spec'
 describe_recipe 'systap-bigdata::test' do
-  it "is running the tomcat server" do
-    service('tomcat').must_be_running
+  it "is running the bigdataHA server" do
+    service('bigdataHA').must_be_running
   end
 end

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/jetty.xml.erb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/jetty.xml.erb	2014-05-07 14:17:24 UTC (rev 8217)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/templates/default/jetty.xml.erb	2014-05-07 14:53:21 UTC (rev 8218)
@@ -40,6 +40,7 @@
 	<!-- =========================================================== -->
 	<!-- Initialize the Jetty MBean container                        -->
 	<!-- =========================================================== -->
+	<!-- Note: This breaks CI if it is enabled
 	<Call name="addBean">
 	  <Arg>
 	    <New id="MBeanContainer" class="org.eclipse.jetty.jmx.MBeanContainer">
@@ -48,16 +49,16 @@
 	      </Arg>
 	    </New>
 	  </Arg>
-	</Call>
+	</Call>-->
 	
-	<!-- Add the static log to the MBean server. -->
+	<!-- Add the static log to the MBean server. 
 	<Call name="addBean">
 	  <Arg>
 	    <New class="org.eclipse.jetty.util.log.Log" />
 	  </Arg>
-	</Call>
+	</Call>-->
 
-	<!-- For remote MBean access (optional) --> 
+	<!-- For remote MBean access (optional)  
 	<New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
 	  <Arg>
 	    <New class="javax.management.remote.JMXServiceURL">
@@ -69,7 +70,7 @@
 	  </Arg>
 	  <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
 	  <Call name="start" />
-	</New>
+	</New>-->
  
     <!-- =========================================================== -->
     <!-- Http Configuration.                                         -->
@@ -121,19 +122,18 @@
     <!-- =========================================================== -->
     <!-- Set handler Collection Structure                            --> 
     <!-- =========================================================== -->
+    <!-- Recommended approach: does not work for HA CI test suite.
     <Set name="handler">
       <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
         <Set name="handlers">
          <Array type="org.eclipse.jetty.server.Handler">
            <Item>
-            <!-- This is the bigdata web application. -->
             <New id="WebAppContext" class="org.eclipse.jetty.webapp.WebAppContext">
 				<Set name="war">
-               <!-- The location of the top-level of the bigdata webapp. -->
-	       				<Property name="jetty.resourceBase" default="<%= node['systap-bigdataHA'][:fed_dir] %>/var/jetty" />
+					<SystemProperty name="jetty.resourceBase" default="bigdata-war/src" />
 				</Set>
             <Set name="contextPath">/bigdata</Set>
-            <Set name="descriptor"><%= node['systap-bigdataHA'][:fed_dir] %>/var/jetty/WEB-INF/web.xml</Set>
+            <Set name="descriptor">WEB-INF/web.xml</Set>
             <Set name="parentLoaderPriority">true</Set>
             <Set name="extractWAR">false</Set>
             </New>
@@ -141,6 +141,47 @@
          </Array>
         </Set>
       </New>
+    </Set> -->
+    <Set name="handler">
+      <New id="Handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">
+        <Set name="handlers">
+         <Array type="org.eclipse.jetty.server.Handler">
+           <Item>
+            <!-- This is the bigdata web application. -->
+            <New id="WebAppContext" class="org.eclipse.jetty.webapp.WebAppContext">
+            <Set name="resourceBase">
+               <!-- The location of the top-level of the bigdata webapp. -->
+               <Property name="jetty.resourceBase" default="<%= node['systap-bigdataHA'][:jetty_dir] %>" />
+            </Set>
+            <Set name="contextPath">/bigdata</Set>
+            <Set name="descriptor">WEB-INF/web.xml</Set>
+            <Set name="descriptor"><%= node['systap-bigdataHA'][:jetty_dir] %>/WEB-INF/web.xml</Set>
+            <Set name="parentLoaderPriority">true</Set>
+            <Set name="extractWAR">false</Set>
+            </New>
+           </Item>
+           <Item>
+            <!-- This appears to be necessary in addition to the above.   -->
+            <!-- Without this, it will not resolve http://localhost:8080/ --> 
+            <!-- and can fail to deliver some of the static content.      -->
+            <New id="ResourceHandler" class="org.eclipse.jetty.server.handler.ResourceHandler">
+            <Set name="resourceBase">
+               <!-- The location of the top-level of the bigdata webapp. -->
+               <Property name="jetty.resourceBase" default="<%= node['systap-bigdataHA'][:jetty_dir] %>" />
+            </Set>
+            <Set name="welcomeFiles">
+             <Array type="java.lang.String">
+              <Item>html/index.html</Item>
+             </Array>
+            </Set>
+            </New>
+           </Item>
+           <!-- <Item>
+            <New id="DefaultHandler" class="org.eclipse.jetty.server.handler.DefaultHandler"></New>
+           </Item> -->
+         </Array>
+        </Set>
+      </New>
     </Set>
       
     <!-- =========================================================== -->

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Bigdata-commit] SF.net SVN: bigdata:[8219] branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/ resources/deployment/vagrant/systap-aws-bigdata-ha

[<dme...@us...>]

Revision: 8219
          http://sourceforge.net/p/bigdata/code/8219
Author:   dmekonnen
Date:     2014-05-07 15:31:17 +0000 (Wed, 07 May 2014)
Log Message:
-----------
attribute simplification and version bump

Modified Paths:
--------------
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb
    branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb	2014-05-07 14:53:21 UTC (rev 8218)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/attributes/default.rb	2014-05-07 15:31:17 UTC (rev 8219)
@@ -3,8 +3,8 @@
 default['systap-bigdataHA'][:bigdata_group] = "bigdata"
 
 # Where to find and build bigdata code
-# default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/BIGDATA_RELEASE_1_3_0"
-default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
+default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/BIGDATA_RELEASE_1_3_0"
+# default['systap-bigdataHA'][:svn]     = "https://svn.code.sf.net/p/bigdata/code/branches/DEPLOYMENT_BRANCH_1_3_1"
 default['systap-bigdataHA'][:source]  = "/home/ubuntu/bigdata-code"
 
 # Name of the federation of services (controls the Apache River GROUPS).

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb	2014-05-07 14:53:21 UTC (rev 8218)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/metadata.rb	2014-05-07 15:31:17 UTC (rev 8219)
@@ -4,7 +4,7 @@
 license		'All rights reserved'
 description	'Installs/Configures Systap Bigdata High Availability'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.txt'))
-version		'0.1.0'
+version		'0.1.1'
 
 depends		'apt'
 depends		'java', '>= 1.22.0' 

Modified: branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb
===================================================================
--- branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb	2014-05-07 14:53:21 UTC (rev 8218)
+++ branches/DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment/vagrant/systap-aws-bigdata-ha/recipes/default.rb	2014-05-07 15:31:17 UTC (rev 8219)
@@ -21,7 +21,6 @@
 	action :create
 end
 
-# directory node['systap-bigdataHA'][:fed_dir] do
 execute "change the ownership of the bigdata home directory to bigdata, which strangely is not" do
  	user "root"
  	group "root"
@@ -58,16 +57,6 @@
 end
 
 #
-# Copy the /etc/init.d/bigdataHA template:
-#
-# template "/etc/init.d/bigdataHA" do
-# 	source  "init.d/bigdataHA.erb"
-# 	user 'root'
-# 	group 'root'
-# 	mode 00755
-# end
-
-#
 # Create the log directory for bigdata:
 #
 directory node['systap-bigdataHA'][:log_dir] do
@@ -90,20 +79,19 @@
 #
 # Install the log4jHA.properties file:
 #
-template  "#{node['systap-bigdataHA'][:fed_dir]}/var/jetty/jetty.xml" do
+template  "#{node['systap-bigdataHA'][:jetty_dir]}/jetty.xml" do
 	source  "jetty.xml.erb"
 	owner   'bigdata'
 	group   'bigdata'
 	mode 00644
 end
 
-
 #
 # Set the absolute path to the RWStore.properties file
 #
 execute "set absolute path to RWStore.properties" do
-	cwd "#{node['systap-bigdataHA'][:fed_dir]}/var/jetty/WEB-INF"
-	command "sed -i 's|<param-value>WEB-INF/RWStore.properties|<param-value>#{node['systap-bigdataHA'][:fed_dir]}/var/jetty/WEB-INF/RWStore.properties|' web.xml"
+	cwd "#{node['systap-bigdataHA'][:jetty_dir]}/WEB-INF"
+	command "sed -i 's|<param-value>WEB-INF/RWStore.properties|<param-value>#{node['systap-bigdataHA'][:jetty_dir]}/WEB-INF/RWStore.properties|' web.xml"
 end
 
 #

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.