[Pvfs2-cvs] commit by nlmills in pvfs2/examples/heartbeat: PVFS2 cib.xml.example

[CVS commit program]

Update of /anoncvs/pvfs2/examples/heartbeat
In directory parlweb1:/tmp/cvs-serv5511/examples/heartbeat

Modified Files:
      Tag: cu-security-branch
	PVFS2 cib.xml.example 
Log Message:
merged in changes from summer at LANL


Index: PVFS2
===================================================================
RCS file: /anoncvs/pvfs2/examples/heartbeat/PVFS2,v
diff -p -u -r1.2.2.1 -r1.2.2.2
--- PVFS2	16 May 2008 15:15:15 -0000	1.2.2.1
+++ PVFS2	25 Aug 2009 17:55:39 -0000	1.2.2.2
@@ -40,8 +40,8 @@ fi
 #
 #######################################################################
 #
-PVFS2D=/usr/sbin/pvfs2-server
-PVFS2CHECK=/usr/bin/pvfs2-check-server
+PVFS2D=/usr/local/sbin/pvfs2-server
+PVFS2CHECK=/usr/local/bin/pvfs2-check-server
 
 
 #	End of Configuration options
@@ -129,7 +129,7 @@ start_pvfs2() {
   ulimit -n 100000 && ulimit -c unlimited
 
   # try to create storage space (ok if it fails)
-  $PVFS2D $OCF_RESKEY_fsconfig -f
+  $PVFS2D $OCF_RESKEY_fsconfig -a $OCF_RESKEY_alias -f
 
   # launch daemon
   ocf_run $PVFS2D -p $OCF_RESKEY_pidfile -a $OCF_RESKEY_alias $OCF_RESKEY_fsconfig 

Index: cib.xml.example
===================================================================
RCS file: /anoncvs/pvfs2/examples/heartbeat/cib.xml.example,v
diff -p -u -r1.1.8.1 -r1.1.8.2
--- cib.xml.example	16 May 2008 15:15:15 -0000	1.1.8.1
+++ cib.xml.example	25 Aug 2009 17:55:39 -0000	1.1.8.2
@@ -49,7 +49,7 @@
              </attributes>
            </instance_attributes>
            <operations>
-             <op id="server0_daemon_monitor" name="monitor" interval="20s" timeout="12s"/>
+             <op id="server0_daemon_monitor" name="monitor" interval="20s" timeout="150s"/>
            </operations>
          </primitive>
        </group>
@@ -82,7 +82,7 @@
              </attributes>
            </instance_attributes>
            <operations>
-             <op id="server1_daemon_monitor" name="monitor" interval="20s" timeout="12s"/>
+             <op id="server1_daemon_monitor" name="monitor" interval="20s" timeout="150s"/>
            </operations>
          </primitive>
        </group>
@@ -116,7 +116,7 @@
              </attributes>
            </instance_attributes>
            <operations>
-             <op id="server2_daemon_monitor" name="monitor" interval="20s" timeout="12s"/>
+             <op id="server2_daemon_monitor" name="monitor" interval="20s" timeout="150s"/>
            </operations>
          </primitive>
        </group>
@@ -150,7 +150,7 @@
              </attributes>
            </instance_attributes>
            <operations>
-             <op id="server3_daemon_monitor" name="monitor" interval="20s" timeout="12s"/>
+             <op id="server3_daemon_monitor" name="monitor" interval="20s" timeout="150s"/>
            </operations>
          </primitive>
        </group>