diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2017-08-30 15:13:53 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2017-09-21 08:53:26 +0200 |
| commit | 7115378f7534f79043ab1b5d2b8fb265145537aa (patch) | |
| tree | 9cae82108199ca88db411c5905b039360cf19f9b /ctdb/tests | |
| parent | 5d12006e29a898c503a885115069fe26f2e084bc (diff) | |
| download | samba-7115378f7534f79043ab1b5d2b8fb265145537aa.tar.gz | |
ctdb-protocol: Add marshalling for control CHECK_PID_SRVID
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13042
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/cunit/protocol_test_101.sh | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/protocol_common_ctdb.c | 13 | ||||
| -rw-r--r-- | ctdb/tests/src/protocol_ctdb_test.c | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/ctdb/tests/cunit/protocol_test_101.sh b/ctdb/tests/cunit/protocol_test_101.sh index 800c6b598f7..8813e188d06 100755 --- a/ctdb/tests/cunit/protocol_test_101.sh +++ b/ctdb/tests/cunit/protocol_test_101.sh @@ -2,7 +2,7 @@ . "${TEST_SCRIPTS_DIR}/unit.sh" -last_control=150 +last_control=151 generate_control_output () { diff --git a/ctdb/tests/src/protocol_common_ctdb.c b/ctdb/tests/src/protocol_common_ctdb.c index 26b1ad65d80..0c3a9a89f2f 100644 --- a/ctdb/tests/src/protocol_common_ctdb.c +++ b/ctdb/tests/src/protocol_common_ctdb.c @@ -603,6 +603,12 @@ void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx, fill_ctdb_string(mem_ctx, &cd->data.db_name); assert(cd->data.db_name != NULL); break; + + case CTDB_CONTROL_CHECK_PID_SRVID: + cd->data.pid_srvid = talloc(mem_ctx, struct ctdb_pid_srvid); + assert(cd->data.pid_srvid != NULL); + fill_ctdb_pid_srvid(mem_ctx, cd->data.pid_srvid); + break; } } @@ -1005,6 +1011,9 @@ void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd, verify_ctdb_string(&cd->data.db_name, &cd2->data.db_name); break; + case CTDB_CONTROL_CHECK_PID_SRVID: + verify_ctdb_pid_srvid(cd->data.pid_srvid, cd2->data.pid_srvid); + break; } } @@ -1417,6 +1426,8 @@ void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx, cd->data.db_id = rand32(); break; + case CTDB_CONTROL_CHECK_PID_SRVID: + break; } } @@ -1762,6 +1773,8 @@ void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd, assert(cd->data.db_id == cd2->data.db_id); break; + case CTDB_CONTROL_CHECK_PID_SRVID: + break; } } diff --git a/ctdb/tests/src/protocol_ctdb_test.c b/ctdb/tests/src/protocol_ctdb_test.c index ade37c2a552..a13901f8363 100644 --- a/ctdb/tests/src/protocol_ctdb_test.c +++ b/ctdb/tests/src/protocol_ctdb_test.c @@ -283,7 +283,7 @@ PROTOCOL_CTDB4_TEST(struct ctdb_req_dmaster, ctdb_req_dmaster, PROTOCOL_CTDB4_TEST(struct ctdb_reply_dmaster, ctdb_reply_dmaster, CTDB_REPLY_DMASTER); -#define NUM_CONTROLS 151 +#define NUM_CONTROLS 152 PROTOCOL_CTDB2_TEST(struct ctdb_req_control_data, ctdb_req_control_data); PROTOCOL_CTDB2_TEST(struct ctdb_reply_control_data, ctdb_reply_control_data); |