managix changes post feedback (taking checkpoint)
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_lsm_stabilization_installer@1446 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-events/src/main/resources/events/node_join/nc_join.sh b/asterix-events/src/main/resources/events/node_join/nc_join.sh
index 5aa86db..6b5280b 100755
--- a/asterix-events/src/main/resources/events/node_join/nc_join.sh
+++ b/asterix-events/src/main/resources/events/node_join/nc_join.sh
@@ -1,7 +1,8 @@
CC_HOST=$1
NC_ID=$2
+IO_DEVICES=$3
if [ ! -d $LOG_DIR ];
then
mkdir -p $LOG_DIR
fi
-$ASTERIX_HOME/bin/asterixnc -node-id $NC_ID -cc-host $CC_HOST -cc-port 1099 -cluster-net-ip-address $IP_LOCATION -data-ip-address $IP_LOCATION -result-ip-address $IP_LOCATION &> $LOG_DIR/${NC_ID}.log
+$ASTERIX_HOME/bin/asterixnc -node-id $NC_ID -cc-host $CC_HOST -cc-port 1099 -cluster-net-ip-address $IP_LOCATION -data-ip-address $IP_LOCATION -iodevices $IO_DEVICES -result-ip-address $IP_LOCATION &> $LOG_DIR/${NC_ID}.log
diff --git a/asterix-events/src/main/resources/schema/cluster.xsd b/asterix-events/src/main/resources/schema/cluster.xsd
index 38afda3..0e1adce 100644
--- a/asterix-events/src/main/resources/schema/cluster.xsd
+++ b/asterix-events/src/main/resources/schema/cluster.xsd
@@ -3,19 +3,21 @@
<!-- definition of simple types -->
<xs:element name="name" type="xs:string"/>
-<xs:element name="java_heap" type="xs:string"/>
+<xs:element name="java_opts" type="xs:string"/>
<xs:element name="logdir" type="xs:string"/>
<xs:element name="id" type="xs:string"/>
-<xs:element name="ip" type="xs:string"/>
+<xs:element name="client-ip" type="xs:string"/>
<xs:element name="cluster-ip" type="xs:string"/>
<xs:element name="key" type="xs:string"/>
<xs:element name="value" type="xs:string"/>
<xs:element name="dir" type="xs:string"/>
<xs:element name="NFS" type="xs:boolean"/>
<xs:element name="store" type="xs:string"/>
+<xs:element name="iodevices" type="xs:string"/>
<xs:element name="java_home" type="xs:string"/>
<xs:element name="username" type="xs:string"/>
<xs:element name="debug" type="xs:integer"/>
+<xs:element name="debugEnabled" type="xs:boolean"/>
<!-- definition of complex elements -->
<xs:element name="workingDir">
@@ -31,10 +33,10 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="cl:id"/>
- <xs:element ref="cl:ip"/>
+ <xs:element ref="cl:client-ip"/>
<xs:element ref="cl:cluster-ip"/>
<xs:element ref="cl:java_home" minOccurs="0"/>
- <xs:element ref="cl:java_heap" minOccurs="0"/>
+ <xs:element ref="cl:java_opts" minOccurs="0"/>
<xs:element ref="cl:logdir" minOccurs="0"/>
<xs:element ref="cl:debug" minOccurs="0"/>
</xs:sequence>
@@ -62,11 +64,12 @@
<xs:complexType>
<xs:sequence>
<xs:element ref="cl:id"/>
- <xs:element ref="cl:ip"/>
- <xs:element ref="cl:java_heap" minOccurs="0"/>
+ <xs:element ref="cl:cluster-ip"/>
<xs:element ref="cl:java_home" minOccurs="0"/>
+ <xs:element ref="cl:java_opts" minOccurs="0"/>
<xs:element ref="cl:logdir" minOccurs="0"/>
<xs:element ref="cl:store" minOccurs="0"/>
+ <xs:element ref="cl:iodevices" minOccurs="0"/>
<xs:element ref="cl:debug" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
@@ -78,11 +81,14 @@
<xs:element ref="cl:name"/>
<xs:element ref="cl:username"/>
<xs:element ref="cl:env" minOccurs="0"/>
- <xs:element ref="cl:java_heap" minOccurs="0"/>
<xs:element ref="cl:java_home" minOccurs="0"/>
+ <xs:element ref="cl:java_opts" minOccurs="0"/>
<xs:element ref="cl:logdir" minOccurs="0"/>
<xs:element ref="cl:store" minOccurs="0"/>
+ <xs:element ref="cl:iodevices" minOccurs="0"/>
<xs:element ref="cl:workingDir"/>
+ <xs:element ref="cl:debugEnabled" minOccurs="0"/>
+ <xs:element ref="cl:debug" minOccurs="0"/>
<xs:element ref="cl:master-node"/>
<xs:element ref="cl:node" maxOccurs="unbounded"/>
</xs:sequence>