The branch, master has been updated
via f1e281c ctdb-scripts: Fix the regular expresssion for parsing
/proc/locks
via c64369c ctdb-locking: Reset ttimer before doing an early return
from 17998fc tdb: Improve wording in a comment
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f1e281cd47d9ebd79e09294606b8fa411ec0fbb4
Author: Amitay Isaacs <[email protected]>
Date: Thu Sep 25 12:46:22 2014 +1000
ctdb-scripts: Fix the regular expresssion for parsing /proc/locks
The major and minor device numbers are hexadecimal not decimal.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Thu Sep 25 07:19:59 CEST 2014 on sn-devel-104
commit c64369cba2e5a975d87d518737abbf04c9871a26
Author: Amitay Isaacs <[email protected]>
Date: Thu Sep 25 12:44:59 2014 +1000
ctdb-locking: Reset ttimer before doing an early return
When timer expires, timeout handler routine sets lock_ctx->ttimer
to a newly created timer event. However, when a node is INACTIVE,
timeout handler returns early with lock_ctx->ttimer set to the previous
timer event. This timer event gets freed when the callback returns and
lock_ctx->ttimer remains set to already freed timer event.
Signed-off-by: Amitay Isaacs <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/debug_locks.sh | 2 +-
ctdb/server/ctdb_lock.c | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh
index 54b52ed..33bf3e6 100755
--- a/ctdb/config/debug_locks.sh
+++ b/ctdb/config/debug_locks.sh
@@ -28,7 +28,7 @@ loadconfig ctdb
sed_cmd=$( ls -li "$CTDB_DBDIR"/*.tdb.* "$CTDB_DBDIR_PERSISTENT"/*.tdb.* |
sed -e "s#${CTDB_DBDIR}/\(.*\)#\1#" \
-e "s#${CTDB_DBDIR_PERSISTENT}/\(.*\)#\1#" |
- awk '{printf "s#[0-9]*:[0-9]*:%s #%s #\n", $1, $10}' )
+ awk '{printf "s#[0-9a-f]*:[0-9a-f]*:%s #%s #\n", $1, $10}' )
# Parse /proc/locks and extract following information
# pid process_name tdb_name offsets [W]
diff --git a/ctdb/server/ctdb_lock.c b/ctdb/server/ctdb_lock.c
index e665310..3a9b327 100644
--- a/ctdb/server/ctdb_lock.c
+++ b/ctdb/server/ctdb_lock.c
@@ -492,6 +492,7 @@ static void ctdb_lock_timeout_handler(struct tevent_context
*ev,
/* If a node stopped/banned, don't spam the logs */
if (ctdb->nodes[ctdb->pnn]->flags & NODE_FLAGS_INACTIVE) {
+ lock_ctx->ttimer = NULL;
return;
}
if (lock_ctx->ctdb_db) {
--
Samba Shared Repository
