Menu
▾
▴
[Bigdata-commit] SF.net SVN: bigdata:[8414] branches/BIGDATA_RELEASE_1_3_0
|
From: <tho...@us...> - 2014-05-23 15:29:44
|
Revision: 8414
http://sourceforge.net/p/bigdata/code/8414
Author: thompsonbry
Date: 2014-05-23 15:29:40 +0000 (Fri, 23 May 2014)
Log Message:
-----------
See #941 (merge deployments branch to main branch).
- HARestore.sh: You can not safely rely on the limited classpath that
is used in this script. This is very likely to break based merely
on the imports into the HARestore, Journal, AbstractJournal and
related classes. At a minimum, we would need to test this classpath
for each release or in CI. I would prefer that we had a means to
assemble a better classpath. The startHAServices script has a
similar problem. The classpath is currently hacked there using the
incantation
export HAJOURNAL_CLASSPATH=`find ${LIB_DIR} -name '*.jar' -print0 | tr '\0' ':'`
- What is the purpose of the "src/resources/deployment" directory? Is
this the "single-server, non-HA" NSS deployment?
- /bigdata/deployment - we put all of this stuff under /src/resources NOT /bigdata.
- I have deleted /bigdata/deployment entirely from branches/BIGDATA_RELEASE_1_3_0.
- I have copied the files (but not the SVN folders) from the
DEPLOYMENT_BRANCH_1_3_1/bigdata/src/resources/deployment into
/src/resources/deployment.
- jetty.xml: copied from the DEPLOYMENTS branch.
- /Users/bryan/Documents/workspace/BIGDATA_RELEASE_1_3_0/src/resources/bin/bigdata.sh
- This has been removed. The src/resources/deployment/nss directory
has similar scripts. It is Ok to add an ant task to start the nss
for developers, but deployments should be based on the "ant stage"
pattern.
- src/resources/deployment/nss/WEB-INF/RWStore.properties should be
removed. The brew script should replace the following line in the
version from bigdata-war/src/WEB-INF/RWStore.properties with an
absolute filename.
com.bigdata.journal.AbstractJournal.file=ZZZZ
- src/resources/deployment/nss/WEB-INF/log4j.properties should be
removed. The brew script should replace the following lines in the
version from dist/var/config/logging/log4j.properties in order to
setup (a) logging to a file; and (b) to specify the absolution
location of that file.
log4j.rootCategory=XXXX
log4j.appender.file.File=YYYY
Modified Paths:
--------------
branches/BIGDATA_RELEASE_1_3_0/bigdata-war/classes/log4j.properties
branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml
branches/BIGDATA_RELEASE_1_3_0/build.xml
branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/HARestore
branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/WEB-INF/classes/log4j.properties
branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/startNSS
branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/init.d/bigdataHA
Added Paths:
-----------
branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/README.txt
branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdataNSS
Removed Paths:
-------------
branches/BIGDATA_RELEASE_1_3_0/bigdata/src/resources/deployment/
branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/bigdata.sh
branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdata
branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/etc/jetty.xml
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-war/classes/log4j.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-war/classes/log4j.properties 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-war/classes/log4j.properties 2014-05-23 15:29:40 UTC (rev 8414)
@@ -1,9 +1,11 @@
# Default log4j configuration. See the individual classes for the
# specific loggers, but generally they are named for the class in
# which they are defined.
-
-# Default log4j configuration for testing purposes.
#
+# This configuration gets used by the bigdata.war artifact when deployed
+# into a servlet container. It also might be used by the bigdata webapp
+# if -Dlog4j.configuration is not specified when starting bigdata.
+#
# You probably want to set the default log level to ERROR.
#
log4j.rootCategory=WARN, dest1
@@ -36,7 +38,7 @@
##
# Rule execution log. This is a formatted log file (comma delimited).
-log4j.logger.com.bigdata.relation.rule.eval.RuleLog=INFO,ruleLog
+#log4j.logger.com.bigdata.relation.rule.eval.RuleLog=INFO,ruleLog
log4j.additivity.com.bigdata.relation.rule.eval.RuleLog=false
log4j.appender.ruleLog=org.apache.log4j.FileAppender
log4j.appender.ruleLog.Threshold=ALL
Modified: branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/bigdata-war/src/jetty.xml 2014-05-23 15:29:40 UTC (rev 8414)
@@ -29,46 +29,46 @@
<Set name="detailedDump">false</Set>
</Get>
- <!-- =========================================================== -->
- <!-- Get the platform mbean server -->
- <!-- =========================================================== -->
- <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
- name="getPlatformMBeanServer" />
-
- <!-- =========================================================== -->
- <!-- 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">
- <Arg>
- <Ref refid="MBeanServer" />
- </Arg>
- </New>
- </Arg>
- </Call>-->
-
- <!-- Add the static log to the MBean server.
- <Call name="addBean">
- <Arg>
- <New class="org.eclipse.jetty.util.log.Log" />
- </Arg>
- </Call>-->
+ <!-- =========================================================== -->
+ <!-- Get the platform mbean server -->
+ <!-- =========================================================== -->
+ <Call id="MBeanServer" class="java.lang.management.ManagementFactory"
+ name="getPlatformMBeanServer" />
+
+ <!-- =========================================================== -->
+ <!-- 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">
+ <Arg>
+ <Ref refid="MBeanServer" />
+ </Arg>
+ </New>
+ </Arg>
+ </Call>-->
+
+ <!-- Add the static log to the MBean server.
+ <Call name="addBean">
+ <Arg>
+ <New class="org.eclipse.jetty.util.log.Log" />
+ </Arg>
+ </Call>-->
- <!-- For remote MBean access (optional)
- <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
- <Arg>
- <New class="javax.management.remote.JMXServiceURL">
- <Arg type="java.lang.String">rmi</Arg>
- <Arg type="java.lang.String" />
- <Arg type="java.lang.Integer"><SystemProperty name="jetty.jmxrmiport" default="1090"/></Arg>
- <Arg type="java.lang.String">/jndi/rmi://<SystemProperty name="jetty.jmxrmihost" default="localhost"/>:<SystemProperty name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
- </New>
- </Arg>
- <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
- <Call name="start" />
- </New>-->
+ <!-- For remote MBean access (optional)
+ <New id="ConnectorServer" class="org.eclipse.jetty.jmx.ConnectorServer">
+ <Arg>
+ <New class="javax.management.remote.JMXServiceURL">
+ <Arg type="java.lang.String">rmi</Arg>
+ <Arg type="java.lang.String" />
+ <Arg type="java.lang.Integer"><Property name="jetty.jmxrmiport" default="1090"/></Arg>
+ <Arg type="java.lang.String">/jndi/rmi://<Property name="jetty.jmxrmihost" default="localhost"/>:<Property name="jetty.jmxrmiport" default="1099"/>/jmxrmi</Arg>
+ </New>
+ </Arg>
+ <Arg>org.eclipse.jetty.jmx:name=rmiconnectorserver</Arg>
+ <Call name="start" />
+ </New>-->
<!-- =========================================================== -->
<!-- Http Configuration. -->
@@ -97,25 +97,25 @@
</New>
<!-- Configure the HTTP endpoint. -->
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref refid="Server" /></Arg>
- <Arg name="factories">
- <Array type="org.eclipse.jetty.server.ConnectionFactory">
- <Item>
- <New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref refid="httpConfig" /></Arg>
- </New>
- </Item>
- </Array>
- </Arg>
- <Set name="host"><SystemProperty name="jetty.host" /></Set>
- <Set name="port"><SystemProperty name="jetty.port" default="8080" /></Set>
- <Set name="idleTimeout"><SystemProperty name="http.timeout" default="30000"/></Set>
- </New>
- </Arg>
- </Call>
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.eclipse.jetty.server.ServerConnector">
+ <Arg name="server"><Ref refid="Server" /></Arg>
+ <Arg name="factories">
+ <Array type="org.eclipse.jetty.server.ConnectionFactory">
+ <Item>
+ <New class="org.eclipse.jetty.server.HttpConnectionFactory">
+ <Arg name="config"><Ref refid="httpConfig" /></Arg>
+ </New>
+ </Item>
+ </Array>
+ </Arg>
+ <Set name="host"><Property name="jetty.host" /></Set>
+ <Set name="port"><Property name="jetty.port" default="8080" /></Set>
+ <Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set>
+ </New>
+ </Arg>
+ </Call>
<!-- =========================================================== -->
<!-- Set handler Collection Structure -->
@@ -142,12 +142,12 @@
<Arg>
<!-- This is the bigdata web application. -->
<New id="WebAppContext" class="org.eclipse.jetty.webapp.WebAppContext">
- <Set name="war"><SystemProperty name="jetty.resourceBase" default="bigdata-war/src"/></Set>
+ <Set name="war"><Property name="jetty.resourceBase" default="bigdata-war/src"/></Set>
<Set name="contextPath">/bigdata</Set>
<Set name="descriptor">WEB-INF/web.xml</Set>
<Set name="parentLoaderPriority">true</Set>
<Set name="extractWAR">false</Set>
- <Set name="overrideDescriptor"><SystemProperty name="jetty.overrideWebXml" default="bigdata-war/src/WEB-INF/override-web.xml"/></Set>
+ <Set name="overrideDescriptor"><Property name="jetty.overrideWebXml" default="bigdata-war/src/WEB-INF/override-web.xml"/></Set>
</New>
</Arg>
</Call>
@@ -166,4 +166,4 @@
<Set name="dumpAfterStart"><Property name="jetty.dump.start" default="false"/></Set>
<Set name="dumpBeforeStop"><Property name="jetty.dump.stop" default="false"/></Set>
-</Configure>
\ No newline at end of file
+</Configure>
Modified: branches/BIGDATA_RELEASE_1_3_0/build.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/build.xml 2014-05-23 15:29:40 UTC (rev 8414)
@@ -935,6 +935,9 @@
<property name="dist.doc" location="${dist.dir}/doc" />
<property name="dist.doc.api" location="${dist.dir}/doc/api" />
<property name="dist.doc.legal" location="${dist.dir}/doc/LEGAL" />
+ <!-- deployment directories having stuff to be staged. -->
+ <property name="deploy" location="src/resources/deployment"/>
+ <property name="deploy.nss" location="${deploy}/nss"/>
<delete dir="${dist.dir}" quiet="true" />
<mkdir dir="${dist.dir}" />
@@ -966,7 +969,7 @@
<property name="bigdata-jini.lib" location="${bigdata.dir}/bigdata-jini/lib/jini/lib" />
<property name="bigdata-rdf.lib" location="${bigdata.dir}/bigdata-rdf/lib" />
<property name="bigdata-sails.lib" location="${bigdata.dir}/bigdata-sails/lib" />
- <property name="bigdata-blueprints.lib" location="${bigdata.dir}/bigdata-blueprints/lib" />
+ <property name="bigdata-blueprints.lib" location="${bigdata.dir}/bigdata-blueprints/lib" />
<property name="bigdata-gom.lib" location="${bigdata.dir}/bigdata-gom/lib" />
<property name="bigdata-jetty.lib" location="${bigdata.dir}/bigdata/lib/jetty" />
<property name="bigdata-http.lib" location="${bigdata.dir}/bigdata-sails/lib/httpcomponents" />
@@ -1265,6 +1268,30 @@
src="http://wiki.bigdata.com/wiki/index.php/NanoSparqlServer?printable=yes"
/>
+ <!-- Stage files specific to NSS deployments provided by Brew and Chef. -->
+ <chmod file="${dist.bin}/bigdata" perm="755" />
+ <copy file="${deploy.nss}/bin/bigdataNSS"
+ todir="${dist.bin}" />
+ <chmod file="${dist.bin}/bigdata" perm="755" />
+ <copy file="${deploy.nss}/bin/startNSS"
+ todir="${dist.bin}" />
+ <chmod file="${dist.bin}/startNSS" perm="755" />
+<!--
+TODO These lines were removed per #951 (Deployments branch merge). They
+break the other deployment models by introducing metavariables for regex
+substitutions.
+
+ bigdata-war/src/WEB-INF/RWStore.properties (staged into bigdata/var/jetty/bigdata/WEB-INF/RWStore.properties)
+
+ and
+
+ bigdata/src/resources/log4j.properties (staged into dist/var/config/logging/log4j.properties).
+ <copy file="${deploy.nss}/WEB-INF/RWStore.properties"
+ todir="${dist.var.jetty}/WEB-INF" overwrite="true" />
+ <copy file="${deploy.nss}/WEB-INF/classes/log4j.properties"
+ todir="${dist.var.jetty}/WEB-INF/classes" overwrite="true" />
+-->
+
</target>
<!-- -->
@@ -1344,8 +1371,41 @@
</target>
+ <target name="package-nss-brew" depends="clean, stage"
+ description="Create compressed tar file for Jetty based deployment via Brew and Chef installers.">
- <!-- FIXME DEBUG and add 'depends="javadoc, stage" (should stage stage javadoc?)' -->
+ <tar destfile="${bigdata.dir}/REL-NSS.${version}.tgz"
+ compression="gzip">
+
+ <tarfileset dir="${bigdata.dir}/dist">
+ <include name="bigdata/doc/**" />
+ <exclude name="bigdata/doc/api/**" />
+ <exclude name="bigdata/doc/HAJournalServer.html" />
+ <include name="bigdata/lib/**" />
+ <exclude name="bigdata/lib/bigdata-ganglia.jar" />
+ <exclude name="bigdata/lib/browser.jar" />
+ <exclude name="bigdata/lib/reggie.jar" />
+ <exclude name="bigdata/lib/zookeeper.jar" />
+ <exclude name="bigdata/lib/jsk-*.jar" />
+ <exclude name="bigdata/lib-dl" />
+ <exclude name="bigdata/lib-ext" />
+ <include name="bigdata/var/jetty/**" />
+ <include name="bigdata/var/config/logging/logging.properties" />
+ <exclude name="bigdata/var/jetty/html/new.html" />
+ <exclude name="bigdata/var/jetty/html/old.html" />
+ </tarfileset>
+
+ <!-- Add scripts separately, making them executable -->
+
+ <tarfileset dir="${bigdata.dir}/dist" filemode="755">
+ <include name="bigdata/bin/bigdataNSS" />
+ <include name="bigdata/bin/startNSS" />
+ </tarfileset>
+ </tar>
+
+ </target>
+
+ <!-- FIXME DEBUG and add 'depends="javadoc, stage" (should stage stage javadoc?)' -->
<!-- Note: can require 'rpm' and 'rpm-build. -->
<!-- TODO: We do not need both this and "deploy-artifact". -->
<target name="rpm" depends="prepare" description="Build RPM installer.">
Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/HARestore
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/HARestore 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/HARestore 2014-05-23 15:29:40 UTC (rev 8414)
@@ -1,10 +1,31 @@
#!/bin/bash
+#
+# This script has been developed for the "systap-aws-bigdata-ha" cluster
+# deployment package.
+#
+# The HARestore script will recreate the Bigdata HA journal file as of
+# the most recent commit point from log and snapshot files. The
+# intended use of the script is to restore a journal file that resides
+# on an ephemeral storage media (especially, an SSD instance disk)
+# from a combination of full backups and transaction logs on durable
+# media (e.g., EBS) following a system reboot. The script should not
+# be executed while Bigdata is running (it requires exclusive access
+# to the journal and will not be able to run if bigdata is already
+# running).
+#
+# HARestore takes no arguments and assumes the Bigdata journal filename\
+# convention: "bigdata-ha.jnl".
+#
+
source /etc/default/bigdataHA
SERVICE_DIR="$FED_DIR/$FEDNAME/$LOGICAL_SERVICE_ID/HAJournalServer"
LIB_DIR="$FED_DIR/lib"
-java -cp $LIB_DIR/bigdata.jar:$LIB_DIR/commons-logging.jar:$LIB_DIR/log4j.jar:$LIB_DIR/highscalelib.jar:$LIB_DIR/fastutil.jar:$LIB_DIR/dsiutils.jar:$LIB_DIR/lgplutils.jar:$LIB_DIR/icu4j.jar -Dlog4j.configuration=file:var/config/logging/log4j.properties com.bigdata.journal.jini.ha.HARestore -o $DATA_DIR/bigdata-ha.jnl $SERVICE_DIR/snapshot $SERVICE_DIR/HALog
-
-
+java -cp $LIB_DIR/bigdata.jar:$LIB_DIR/commons-logging.jar:$LIB_DIR/log4j.jar:$LIB_DIR/highscalelib.jar:$LIB_DIR/fastutil.jar:$LIB_DIR/dsiutils.jar:$LIB_DIR/lgplutils.jar:$LIB_DIR/icu4j.jar\
+ -Dlog4j.configuration=file:var/config/logging/log4j.properties\
+ com.bigdata.journal.jini.ha.HARestore\
+ -o $DATA_DIR/bigdata-ha.jnl\
+ $SERVICE_DIR/snapshot\
+ $SERVICE_DIR/HALog
Deleted: branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/bigdata.sh
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/bigdata.sh 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/bin/bigdata.sh 2014-05-23 15:29:40 UTC (rev 8414)
@@ -1,61 +0,0 @@
-#!/bin/bash
-
-# Start the services and put the JVM in the background. All services will
-# run in a single JVM. See Apache River com.sun.jini.start.ServiceStarter
-# for more details. The services are configured in the accompanying
-# startHAServices.config file. Specific configuration options for each
-# service are defined in the documentation for that service.
-#
-# Note: One drawback with running each service in the same JVM is that the
-# GC load of all services is combined and all services would be suspended
-# at the same time by a Full GC pass. If this is a problem, then you can
-# break out the river services (ClassServer and Reggie) into a separate
-# ServiceStarter instance from the HAJournalServer.
-
-# The top-level of the installation.
-pushd `dirname $0` > /dev/null;cd ..;INSTALL_DIR=`pwd`;popd > /dev/null
-
-##
-# HAJournalServer configuration parameter overrides (see HAJournal.config).
-#
-# The bigdata HAJournal.config file may be heavily parameterized through
-# environment variables that get passed through into the JVM started by
-# this script and are thus made available to the HAJournalServer when it
-# interprets the contents of the HAJournal.config file. See HAJournal.config
-# for the meaning of these environment variables.
-#
-# Note: Many of these properties have defaults.
-##
-
-export JETTY_XML="${INSTALL_DIR}/var/jetty/jetty.xml"
-export JETTY_RESOURCE_BASE="${INSTALL_DIR}/var/jetty"
-export LIB_DIR=${INSTALL_DIR}/lib
-export CONFIG_DIR=${INSTALL_DIR}/var/config
-export LOG4J_CONFIG=${CONFIG_DIR}/logging/log4j.properties
-
-# TODO Explicitly enumerate JARs so we can control order if necessary and
-# deploy on OS without find and tr.
-export HAJOURNAL_CLASSPATH=`find ${LIB_DIR} -name '*.jar' -print0 | tr '\0' ':'`
-
-export JAVA_OPTS="\
- -server -Xmx4G\
- -Dlog4j.configuration=${LOG4J_CONFIG}\
- -Djetty.resourceBase=${JETTY_RESOURCE_BASE}\
- -DJETTY_XML=${JETTY_XML}\
-"
-
-cmd="java ${JAVA_OPTS} \
- -server -Xmx4G \
- -cp ${HAJOURNAL_CLASSPATH} \
- com.bigdata.rdf.sail.webapp.NanoSparqlServer \
- 9999 kb \
- ${INSTALL_DIR}/var/jetty/WEB-INF/GraphStore.properties \
-"
-echo "Running: $cmd"
-$cmd&
-pid=$!
-# echo "PID=$pid"
-echo "kill $pid" > stop.sh
-chmod +w stop.sh
-
-# Note: To obtain the pid, do: read pid < "$pidFile"
Added: branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/README.txt
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/README.txt (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/README.txt 2014-05-23 15:29:40 UTC (rev 8414)
@@ -0,0 +1,26 @@
+brew - homebrew installer. installation is the NSS using jetty. No HA features.
+
+chef - cook book has recipes for bigdata under tomcat; bigdata HA; MapGraph;
+ NSS using jetty.
+
+nss - NSS using jetty. The directory contains shell scripts to (a) control
+ the run state of bigdata in an init.d style script; and (b) start the
+ NSS using jetty.
+
+vagrant - HA cluster launcher for AWS; MapGraph launcher; NSS using jetty
+ launcher; tomcat + bigdata.war install.
+
+====== Maintenance ======
+
+TODO Rename these things to be less ambiguous once we agree on names.
+
+TODO Document how things are structured from a support and maintenance
+perspective.
+
+TODO Document on the wiki what these various deployments are, how to
+choose the right one, and where to get it. See the following tickets.
+Also capture the deployment matrix that Daniel has sent by email.
+
+#926 Add Wiki Entry for Brew Deployment
+#925 Add Wiki Entry for Vagrant Deployments
+#924 Add Wiki Entry for Chef Cookbooks
Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/WEB-INF/classes/log4j.properties
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/WEB-INF/classes/log4j.properties 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/WEB-INF/classes/log4j.properties 2014-05-23 15:29:40 UTC (rev 8414)
@@ -53,7 +53,7 @@
##
# Rule execution log. This is a formatted log file (comma delimited).
-log4j.logger.com.bigdata.relation.rule.eval.RuleLog=INFO,ruleLog
+#log4j.logger.com.bigdata.relation.rule.eval.RuleLog=INFO,ruleLog
log4j.additivity.com.bigdata.relation.rule.eval.RuleLog=false
log4j.appender.ruleLog=org.apache.log4j.FileAppender
log4j.appender.ruleLog.Threshold=ALL
Deleted: branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdata
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdata 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdata 2014-05-23 15:29:40 UTC (rev 8414)
@@ -1,109 +0,0 @@
-#!/bin/bash
-
-# init.d style script for bigdata HA services. The script can be used
-# to 'start' or 'stop' services.
-#
-# Environment:
-#
-# binDir - The directory containing the installed scripts.
-# pidFile - The pid is written on this file.
-#
-# Misc.
-#
-# See http://tldp.org/LDP/abs/html/index.html
-#
-# Note: Blank lines are significant in shell scripts.
-#
-# Note: Children must do "exit 0" to indicate success.
-#
-# Note: Convert DOS cr-lf to unix style in emacs: C-x RET f then unix
-
-# Source function library (just used for 'action'). If you don't have this
-# it SHOULD automatically use the inline definition for "action()".
-
-#
-# the following template line will be replaced by a deployer application (e.g. brew, chef)
-#
-export INSTALL_TYPE="<%= INSTALL_TYPE %>"
-export BD_HOME="<%= BD_HOME %>"
-pidFile=${BD_HOME}/var/lock/pid
-binDir=${BD_HOME}/bin
-
-
-#
-# See how we were called.
-#
-case "$1" in
- start)
-#
-# Start the ServiceStarter and child services if not running.
-#
- if [ -f "$pidFile" ]; then
- read pid < "$pidFile"
- pidno=$( ps ax | grep $pid | awk '{ print $1 }' | grep $pid )
- if [ -z "$pidno" ]; then
-# The process has died so remove the old pid file.
- echo $"`date` : `hostname` : $pid died?"
- rm -f "$pidFile"
- fi
- fi
- if [ ! -f "$pidFile" ]; then
- echo -ne $"`date` : `hostname` : bringing bigdata services up ... "
- $binDir/startNSS
- echo "done!"
- else
- echo $"`date` : `hostname` : running as $pid"
- fi
- ;;
- stop)
-#
-# Stop the ServiceStarter and all child services.
-#
- if [ -f "$pidFile" ]; then
- read pid < "$pidFile"
- pidno=$( ps ax | grep $pid | awk '{ print $1 }' | grep $pid )
- if [ -z "$pidno" ]; then
-# The process has died so remove the old pid file.
- echo $"`date` : `hostname` : $pid died?"
- rm -f "$pidFile"
- else
- echo -ne $"`date` : `hostname` : bringing bigdata service down ... "
- kill $pid
- rm -f "$pidFile"
- echo "done!"
- fi
- fi
- ;;
- status)
-#
-# Report status for the ServicesManager (up or down).
-#
- if [ -f "$pidFile" ]; then
- read pid < "$pidFile"
- pidno=$( ps ax | grep $pid | awk '{ print $1 }' | grep $pid )
- if [ -z "$pidno" ]; then
- echo $"`date` : `hostname` : process died? pid=$pid."
- else
- echo $"`date` : `hostname` : running as $pid."
- fi
- else
- echo $"`date` : `hostname` : not running."
- fi
- ;;
-#
-# Simply stop then start.
-#
- restart)
- $0 stop
- $0 start
- ;;
- *)
-#
-# Usage
-#
- me=`basename $0`
- echo $"Usage: $0 {start|stop|status|restart}"
- exit 1
-esac
-
-exit 0
Added: branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdataNSS
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdataNSS (rev 0)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdataNSS 2014-05-23 15:29:40 UTC (rev 8414)
@@ -0,0 +1,109 @@
+#!/bin/bash
+
+# init.d style script for bigdata HA services. The script can be used
+# to 'start' or 'stop' services.
+#
+# Environment:
+#
+# binDir - The directory containing the installed scripts.
+# pidFile - The pid is written on this file.
+#
+# Misc.
+#
+# See http://tldp.org/LDP/abs/html/index.html
+#
+# Note: Blank lines are significant in shell scripts.
+#
+# Note: Children must do "exit 0" to indicate success.
+#
+# Note: Convert DOS cr-lf to unix style in emacs: C-x RET f then unix
+
+# Source function library (just used for 'action'). If you don't have this
+# it SHOULD automatically use the inline definition for "action()".
+
+#
+# the following template line will be replaced by a deployer application (e.g. brew, chef)
+#
+export INSTALL_TYPE="<%= INSTALL_TYPE %>"
+export BD_HOME="<%= BD_HOME %>"
+pidFile=${BD_HOME}/var/lock/pid
+binDir=${BD_HOME}/bin
+
+
+#
+# See how we were called.
+#
+case "$1" in
+ start)
+#
+# Start the ServiceStarter and child services if not running.
+#
+ if [ -f "$pidFile" ]; then
+ read pid < "$pidFile"
+ pidno=$( ps ax | grep $pid | awk '{ print $1 }' | grep $pid )
+ if [ -z "$pidno" ]; then
+# The process has died so remove the old pid file.
+ echo $"`date` : `hostname` : $pid died?"
+ rm -f "$pidFile"
+ fi
+ fi
+ if [ ! -f "$pidFile" ]; then
+ echo -ne $"`date` : `hostname` : bringing bigdata services up ... "
+ $binDir/startNSS
+ echo "done!"
+ else
+ echo $"`date` : `hostname` : running as $pid"
+ fi
+ ;;
+ stop)
+#
+# Stop the ServiceStarter and all child services.
+#
+ if [ -f "$pidFile" ]; then
+ read pid < "$pidFile"
+ pidno=$( ps ax | grep $pid | awk '{ print $1 }' | grep $pid )
+ if [ -z "$pidno" ]; then
+# The process has died so remove the old pid file.
+ echo $"`date` : `hostname` : $pid died?"
+ rm -f "$pidFile"
+ else
+ echo -ne $"`date` : `hostname` : bringing bigdata service down ... "
+ kill $pid
+ rm -f "$pidFile"
+ echo "done!"
+ fi
+ fi
+ ;;
+ status)
+#
+# Report status for the ServicesManager (up or down).
+#
+ if [ -f "$pidFile" ]; then
+ read pid < "$pidFile"
+ pidno=$( ps ax | grep $pid | awk '{ print $1 }' | grep $pid )
+ if [ -z "$pidno" ]; then
+ echo $"`date` : `hostname` : process died? pid=$pid."
+ else
+ echo $"`date` : `hostname` : running as $pid."
+ fi
+ else
+ echo $"`date` : `hostname` : not running."
+ fi
+ ;;
+#
+# Simply stop then start.
+#
+ restart)
+ $0 stop
+ $0 start
+ ;;
+ *)
+#
+# Usage
+#
+ me=`basename $0`
+ echo $"Usage: $0 {start|stop|status|restart}"
+ exit 1
+esac
+
+exit 0
Property changes on: branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/bigdataNSS
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/startNSS
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/startNSS 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/bin/startNSS 2014-05-23 15:29:40 UTC (rev 8414)
@@ -2,9 +2,9 @@
export INSTALL_DIR=${BD_HOME}
if [ $INSTALL_TYPE == "BREW" ]; then
- export LIB_DIR=${INSTALL_DIR}/libexec
+ export LIB_DIR=${INSTALL_DIR}/libexec
else
- export LIB_DIR=${INSTALL_DIR}/lib
+ export LIB_DIR=${INSTALL_DIR}/lib
fi
export JETTY_CLASSPATH=`find ${LIB_DIR} -name '*.jar' -print0 | tr '\0' ':'`
export JETTY_DIR=${INSTALL_DIR}/var/jetty
@@ -21,7 +21,7 @@
export DATA_DIR=${BD_HOME}/var/data
if [ ! -d $DATA_DIR ]; then
- mkdir -p $DATA_DIR
+ mkdir -p $DATA_DIR
fi
export NSS="com.bigdata.rdf.sail.webapp.NanoSparqlServer"
@@ -34,7 +34,7 @@
export JETTY_PORT="8080"
fi
if [ -z "${JETTY_XML}" ]; then
- export JETTY_XML="${JETTY_DIR}/etc/jetty.xml"
+ export JETTY_XML="${JETTY_DIR}/jetty.xml"
fi
if [ -z "${JETTY_RESOURCE_BASE}" ]; then
export JETTY_RESOURCE_BASE="${JETTY_DIR}"
@@ -57,7 +57,7 @@
# Setup the directory for the pid of the ServiceStarter process.
lockDir=${INSTALL_DIR}/var/lock
if [ ! -d $lockDir ]; then
- mkdir -p $lockDir
+ mkdir -p $lockDir
fi
pidFile=$lockDir/pid
Deleted: branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/etc/jetty.xml
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/etc/jetty.xml 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/deployment/nss/etc/jetty.xml 2014-05-23 15:29:40 UTC (rev 8414)
@@ -1,133 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure.dtd">
-<!-- See http://www.eclipse.org/jetty/documentation/current/ -->
-<!-- See http://wiki.eclipse.org/Jetty/Reference/jetty.xml_syntax -->
-<Configure id="Server" class="org.eclipse.jetty.server.Server">
-
- <!-- =========================================================== -->
- <!-- Configure the Server Thread Pool. -->
- <!-- The server holds a common thread pool which is used by -->
- <!-- default as the executor used by all connectors and servlet -->
- <!-- dispatches. -->
- <!-- -->
- <!-- Configuring a fixed thread pool is vital to controlling the -->
- <!-- maximal memory footprint of the server and is a key tuning -->
- <!-- parameter for tuning. In an application that rarely blocks -->
- <!-- then maximal threads may be close to the number of 5*CPUs. -->
- <!-- In an application that frequently blocks, then maximal -->
- <!-- threads should be set as high as possible given the memory -->
- <!-- available. -->
- <!-- -->
- <!-- Consult the javadoc of o.e.j.util.thread.QueuedThreadPool -->
- <!-- for all configuration that may be set here. -->
- <!-- =========================================================== -->
- <!-- uncomment to change type of threadpool -->
- <Arg name="threadpool"><New id="threadpool" class="org.eclipse.jetty.util.thread.QueuedThreadPool"/></Arg>
- <!-- -->
- <Get name="ThreadPool">
- <Set name="minThreads" type="int"><SystemProperty name="jetty.threads.min" default="10"/></Set>
- <Set name="maxThreads" type="int"><SystemProperty name="jetty.threads.max" default="64"/></Set>
- <Set name="idleTimeout" type="int"><SystemProperty name="jetty.threads.timeout" default="60000"/></Set>
- <Set name="detailedDump">false</Set>
- </Get>
-
- <!-- =========================================================== -->
- <!-- Http Configuration. -->
- <!-- This is a common configuration instance used by all -->
- <!-- connectors that can carry HTTP semantics (HTTP, HTTPS, SPDY)-->
- <!-- It configures the non wire protocol aspects of the HTTP -->
- <!-- semantic. -->
- <!-- -->
- <!-- Consult the javadoc of o.e.j.server.HttpConfiguration -->
- <!-- for all configuration that may be set here. -->
- <!-- =========================================================== -->
- <New id="httpConfig" class="org.eclipse.jetty.server.HttpConfiguration">
- <Set name="secureScheme">https</Set>
- <Set name="securePort"><Property name="jetty.secure.port" default="8443" /></Set>
- <Set name="outputBufferSize"><Property name="jetty.output.buffer.size" default="32768" /></Set>
- <Set name="requestHeaderSize"><Property name="jetty.request.header.size" default="8192" /></Set>
- <Set name="responseHeaderSize"><Property name="jetty.response.header.size" default="8192" /></Set>
- <Set name="sendServerVersion"><Property name="jetty.send.server.version" default="true" /></Set>
- <Set name="sendDateHeader"><Property name="jetty.send.date.header" default="false" /></Set>
- <Set name="headerCacheSize">512</Set>
- <!-- Uncomment to enable handling of X-Forwarded- style headers
- <Call name="addCustomizer">
- <Arg><New class="org.eclipse.jetty.server.ForwardedRequestCustomizer"/></Arg>
- </Call>
- -->
- </New>
-
- <!-- Configure the HTTP endpoint. -->
- <Call name="addConnector">
- <Arg>
- <New class="org.eclipse.jetty.server.ServerConnector">
- <Arg name="server"><Ref refid="Server" /></Arg>
- <Arg name="factories">
- <Array type="org.eclipse.jetty.server.ConnectionFactory">
- <Item>
- <New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Arg name="config"><Ref refid="httpConfig" /></Arg>
- </New>
- </Item>
- </Array>
- </Arg>
- <Set name="host"><Property name="jetty.host" /></Set>
- <Set name="port"><Property name="jetty.port" default="8080" /></Set>
- <Set name="idleTimeout"><Property name="http.timeout" default="30000"/></Set>
- </New>
- </Arg>
- </Call>
-
- <!-- =========================================================== -->
- <!-- Set handler Collection Structure -->
- <!-- =========================================================== -->
- <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="<%= JETTY_DIR %>" />
- </Set>
- <Set name="contextPath">/bigdata</Set>
- <Set name="descriptor"><%= 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="<%= 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>
-
- <!-- =========================================================== -->
- <!-- extra server options -->
- <!-- =========================================================== -->
- <Set name="stopAtShutdown">true</Set>
- <Set name="stopTimeout">5000</Set>
- <Set name="dumpAfterStart"><Property name="jetty.dump.start" default="false"/></Set>
- <Set name="dumpBeforeStop"><Property name="jetty.dump.stop" default="false"/></Set>
-
-</Configure>
Modified: branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/init.d/bigdataHA
===================================================================
--- branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/init.d/bigdataHA 2014-05-22 19:23:15 UTC (rev 8413)
+++ branches/BIGDATA_RELEASE_1_3_0/src/resources/etc/init.d/bigdataHA 2014-05-23 15:29:40 UTC (rev 8414)
@@ -95,7 +95,7 @@
fi
fi
if [ ! -f "$pidFile" ]; then
- action $"`date` : `hostname` : bringing up services: " sudo -u $BD_USER -g $BD_GROUP bash -c "source /etc/default/bigdataHA ; $binDir/startHAServices"
+ action $"`date` : `hostname` : bringing up services: " sudo -u $BD_USER -g $BD_GROUP bash -c "source /etc/default/bigdataHA ; $binDir/startHAServices > /dev/null 2>&1 &"
else
echo $"`date` : `hostname` : running as $pid"
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
