diff options
| author | Volker Lendecke <vl@samba.org> | 2020-04-07 17:26:26 +0200 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2020-04-28 09:08:39 +0000 |
| commit | bdabf7812223dc0c365fd13aa53d35d10edcdece (patch) | |
| tree | c4e982abbacfcfcdc00f8ee3ecd83b9ddf878950 /ctdb/tests | |
| parent | 6f56f45639e6404161da425bcd2654624907a439 (diff) | |
| download | samba-bdabf7812223dc0c365fd13aa53d35d10edcdece.tar.gz | |
ctdb-protocol: Add marshalling for control ECHO_DATA
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'ctdb/tests')
| -rwxr-xr-x | ctdb/tests/UNIT/cunit/protocol_test_101.sh | 2 | ||||
| -rw-r--r-- | ctdb/tests/src/protocol_common_ctdb.c | 20 | ||||
| -rw-r--r-- | ctdb/tests/src/protocol_ctdb_test.c | 2 |
3 files changed, 22 insertions, 2 deletions
diff --git a/ctdb/tests/UNIT/cunit/protocol_test_101.sh b/ctdb/tests/UNIT/cunit/protocol_test_101.sh index 6b07dc017ba..79dfabeb801 100755 --- a/ctdb/tests/UNIT/cunit/protocol_test_101.sh +++ b/ctdb/tests/UNIT/cunit/protocol_test_101.sh @@ -2,7 +2,7 @@ . "${TEST_SCRIPTS_DIR}/unit.sh" -last_control=155 +last_control=156 generate_control_output () { diff --git a/ctdb/tests/src/protocol_common_ctdb.c b/ctdb/tests/src/protocol_common_ctdb.c index 6989010cd6f..f1d662f0e1d 100644 --- a/ctdb/tests/src/protocol_common_ctdb.c +++ b/ctdb/tests/src/protocol_common_ctdb.c @@ -600,6 +600,12 @@ void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx, assert(cd->data.db_vacuum != NULL); fill_ctdb_db_vacuum(mem_ctx, cd->data.db_vacuum); break; + + case CTDB_CONTROL_ECHO_DATA: + cd->data.echo_data = talloc(mem_ctx, struct ctdb_echo_data); + assert(cd->data.echo_data != NULL); + fill_ctdb_echo_data(mem_ctx, cd->data.echo_data); + break; } } @@ -994,6 +1000,10 @@ void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd, case CTDB_CONTROL_DB_VACUUM: verify_ctdb_db_vacuum(cd->data.db_vacuum, cd2->data.db_vacuum); break; + + case CTDB_CONTROL_ECHO_DATA: + verify_ctdb_echo_data(cd->data.echo_data, cd2->data.echo_data); + break; } } @@ -1393,6 +1403,12 @@ void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx, case CTDB_CONTROL_DB_VACUUM: break; + + case CTDB_CONTROL_ECHO_DATA: + cd->data.echo_data = talloc(mem_ctx, struct ctdb_echo_data); + assert(cd->data.echo_data != NULL); + fill_ctdb_echo_data(mem_ctx, cd->data.echo_data); + break; } } @@ -1733,6 +1749,10 @@ void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd, case CTDB_CONTROL_DB_VACUUM: break; + + case CTDB_CONTROL_ECHO_DATA: + verify_ctdb_echo_data(cd->data.echo_data, cd2->data.echo_data); + break; } } diff --git a/ctdb/tests/src/protocol_ctdb_test.c b/ctdb/tests/src/protocol_ctdb_test.c index b13cd5491d1..6a9a8a4aef6 100644 --- a/ctdb/tests/src/protocol_ctdb_test.c +++ b/ctdb/tests/src/protocol_ctdb_test.c @@ -284,7 +284,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 156 +#define NUM_CONTROLS 157 PROTOCOL_CTDB2_TEST(struct ctdb_req_control_data, ctdb_req_control_data); PROTOCOL_CTDB2_TEST(struct ctdb_reply_control_data, ctdb_reply_control_data); |