[SCM] CTDB repository - branch master updated - ctdb-1.0.83-2-gaf1b3de

[Ronnie Sahlberg]

The branch, master has been updated
       via  af1b3de978089a9819716b33c13c941b5558cb17 (commit)
       via  03d304e72a5839dc8d8d2e2312b346c21dca5774 (commit)
      from  f236fa289f3115b1f4eb108eb668392dc520f61a (commit)

http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit af1b3de978089a9819716b33c13c941b5558cb17
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Jun 2 15:05:41 2009 +1000

    new version 1.0.84

commit 03d304e72a5839dc8d8d2e2312b346c21dca5774
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Jun 2 15:03:44 2009 +1000

    teach ONNODE about deleted nodes

-----------------------------------------------------------------------

Summary of changes:
 packaging/RPM/ctdb.spec |    4 +++-
 tools/onnode            |    7 ++++---
 2 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index b2f7efa..83b43c0 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
-Version: 1.0.83
+Version: 1.0.84
 Release: 1
 Epoch: 0
 License: GNU GPL version 3
@@ -131,6 +131,8 @@ fi
 %{_libdir}/pkgconfig/ctdb.pc
 
 %changelog
+* Tue Jun 2 2009 : Version 1.0.84
+ - Fix a bug in onnode that could not handle dead nodes
 * Tue Jun 2 2009 : Version 1.0.83
  - Document how to remove a ndoe from a running cluster.
  - Hide all deleted nodes from ctdb output.
diff --git a/tools/onnode b/tools/onnode
index d7adbb0..aae7770 100755
--- a/tools/onnode
+++ b/tools/onnode
@@ -95,7 +95,7 @@ echo_nth ()
     shift $n
     local node="$1"
 
-    if [ -n "$node" ] ; then
+    if [ -n "$node" -a "$node" != "#DEAD" ] ; then
 	echo $node
     else
 	echo "${prog}: \"node ${n}\" does not exist" >&2
@@ -206,7 +206,7 @@ get_nodes ()
 	all_nodes="$CTDB_NODES_SOCKETS"
     else
 	[ -f "$CTDB_NODES_FILE" ] || CTDB_NODES_FILE=/etc/ctdb/nodes
-	all_nodes=$(egrep '^[[:alnum:]]' $CTDB_NODES_FILE)
+	all_nodes=$(sed -e 's@#.*@@g' -e 's@ *@@g' -e 's@^$@#DEAD@' $CTDB_NODES_FILE)
     fi
 
     local nodes=""
@@ -215,7 +215,8 @@ get_nodes ()
 	[ $? != 0 ] && exit 1  # Required to catch exit in above subshell.
 	case "$n" in
 	    all)
-		echo $all_nodes ;;
+		echo "${all_nodes//#DEAD/}"
+		;;
 	    ok|healthy) 
 		get_nodes_with_status "$all_nodes" "healthy" || exit 1
 		;;


-- 
CTDB repository