The branch, master has been updated
via 87f7d32 ctdb-tests: Fix ctdb process-exist tests
via 3067db5 ctdb-tests: Add a dummy ctdb client for testing
via 7dec80a ctdb-tests: Fix the implementation of process-exists in
fake daemon
via d0a20ba ctdb-daemon: Fix implementation of process_exists control
via 83039d6 ctdb-tools: Fix CID 1414746
via eb16d4a ctdb-tools: Use ssize_t instead of int for checking the
status of read()
from 4102697 s3/vfs: move ACE4_ADD_FILE/ACE4_DELETE_CHILD mapping from
NFSv4 framework to vfs_zfsacl
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 87f7d32a906799e83cb9b023978e689a630de017
Author: Amitay Isaacs
Date: Fri Aug 25 16:55:34 2017 +1000
ctdb-tests: Fix ctdb process-exist tests
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13012
Signed-off-by: Amitay Isaacs
Reviewed-by: Martin Schwenke
Autobuild-User(master): Amitay Isaacs
Autobuild-Date(master): Sat Sep 9 14:44:57 CEST 2017 on sn-devel-144
commit 3067db5b50162fdae288aaad8e75beb924fc9494
Author: Amitay Isaacs
Date: Wed Aug 30 13:05:32 2017 +1000
ctdb-tests: Add a dummy ctdb client for testing
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13012
Signed-off-by: Amitay Isaacs
Reviewed-by: Martin Schwenke
commit 7dec80a7c042d83f9d48c75a8717c3d1b59b1fbf
Author: Amitay Isaacs
Date: Fri Aug 25 16:54:47 2017 +1000
ctdb-tests: Fix the implementation of process-exists in fake daemon
Keep track of clients and their pids.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13012
Signed-off-by: Amitay Isaacs
Reviewed-by: Martin Schwenke
commit d0a20baf43834c7290dfd8f256d9521724202f0c
Author: Amitay Isaacs
Date: Fri Aug 25 15:00:59 2017 +1000
ctdb-daemon: Fix implementation of process_exists control
Only check processes that are CTDB clients.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13012
Signed-off-by: Amitay Isaacs
Reviewed-by: Martin Schwenke
commit 83039d6a5c98683ed2ba96c2be0f5490d22799ce
Author: Amitay Isaacs
Date: Thu Sep 7 11:38:41 2017 +1000
ctdb-tools: Fix CID 1414746
Signed-off-by: Amitay Isaacs
Reviewed-by: Martin Schwenke
commit eb16d4a61cecb0c3d44a344045b0856d7c040cb1
Author: Amitay Isaacs
Date: Tue Sep 5 16:42:58 2017 +1000
ctdb-tools: Use ssize_t instead of int for checking the status of read()
Signed-off-by: Amitay Isaacs
Reviewed-by: Martin Schwenke
---
Summary of changes:
ctdb/server/ctdb_daemon.c | 16 +--
ctdb/tests/simple/07_ctdb_process_exists.sh | 34 ---
ctdb/tests/src/dummy_client.c | 148
ctdb/tests/src/fake_ctdbd.c | 81 ++-
ctdb/tests/tool/ctdb.process-exists.001.sh | 12 ++-
ctdb/tools/ctdb.c | 14 ++-
ctdb/wscript| 3 +-
7 files changed, 276 insertions(+), 32 deletions(-)
create mode 100644 ctdb/tests/src/dummy_client.c
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 41f042e..7fceed0 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -1754,12 +1754,16 @@ int32_t ctdb_control_process_exists(struct ctdb_context
*ctdb, pid_t pid)
{
struct ctdb_client *client;
- if (ctdb->nodes[ctdb->pnn]->flags &
(NODE_FLAGS_BANNED|NODE_FLAGS_STOPPED)) {
- client = ctdb_find_client_by_pid(ctdb, pid);
- if (client != NULL) {
- DEBUG(DEBUG_NOTICE,(__location__ " Killing client with
pid:%d on banned/stopped node\n", (int)pid));
- talloc_free(client);
- }
+ client = ctdb_find_client_by_pid(ctdb, pid);
+ if (client == NULL) {
+ return -1;
+ }
+
+ if (ctdb->nodes[ctdb->pnn]->flags & NODE_FLAGS_INACTIVE) {
+ DEBUG(DEBUG_NOTICE,
+ ("Killing client with pid:%d on banned/stopped node\n",
+ (int)pid));
+ talloc_free(client);
return -1;
}
diff --git a/ctdb/tests/simple/07_ctdb_process_exists.sh
b/ctdb/tests/simple/07_ctdb_process_exists.sh
index b7492a8..c44924b 100755
--- a/ctdb/tests/simple/07_ctdb_process_exists.sh
+++ b/ctdb/tests/simple/07_ctdb_process_exists.sh
@@ -15,11 +15,10 @@