sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-24 13:57:43 +03:00
Code

ctdb-protocol: Add marshalling for control DB_VACUUM

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2019-07-30 10:52:05 +10:00 committed by Amitay Isaacs
parent a896486b62
commit 496204feb0
7 changed files with 71 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ctdb/protocol/protocol_api.h
View File

@ -607,6 +607,10 @@ void ctdb_req_control_vacuum_fetch(struct ctdb_req_control *request,
struct ctdb_rec_buffer *recbuf);
int ctdb_reply_control_vacuum_fetch(struct ctdb_reply_control *reply);
void ctdb_req_control_db_vacuum(struct ctdb_req_control *request,
struct ctdb_db_vacuum *db_vacuum);
int ctdb_reply_control_db_vacuum(struct ctdb_reply_control *reply);
/* From protocol/protocol_debug.c */
void ctdb_packet_print(uint8_t *buf, size_t buflen, FILE *fp);

24
ctdb/protocol/protocol_client.c
View File

@ -2361,3 +2361,27 @@ int ctdb_reply_control_vacuum_fetch(struct ctdb_reply_control *reply)
return reply->status;
}
/* CTDB_CONTROL_DB_VACUUM */
void ctdb_req_control_db_vacuum(struct ctdb_req_control *request,
struct ctdb_db_vacuum *db_vacuum)
{
request->opcode = CTDB_CONTROL_DB_VACUUM;
request->pad = 0;
request->srvid = 0;
request->client_id = 0;
request->flags = 0;
request->rdata.opcode = CTDB_CONTROL_DB_VACUUM;
request->rdata.data.db_vacuum = db_vacuum;
}
int ctdb_reply_control_db_vacuum(struct ctdb_reply_control *reply)
{
if (reply->rdata.opcode != CTDB_CONTROL_DB_VACUUM) {
return EPROTO;
}
return reply->status;
}

25
ctdb/protocol/protocol_control.c
View File

@ -411,6 +411,10 @@ static size_t ctdb_req_control_data_len(struct ctdb_req_control_data *cd)
case CTDB_CONTROL_VACUUM_FETCH:
len = ctdb_rec_buffer_len(cd->data.recbuf);
break;
case CTDB_CONTROL_DB_VACUUM:
len = ctdb_db_vacuum_len(cd->data.db_vacuum);
break;
}
return len;
@ -690,6 +694,10 @@ static void ctdb_req_control_data_push(struct ctdb_req_control_data *cd,
case CTDB_CONTROL_VACUUM_FETCH:
ctdb_rec_buffer_push(cd->data.recbuf, buf, &np);
break;
case CTDB_CONTROL_DB_VACUUM:
ctdb_db_vacuum_push(cd->data.db_vacuum, buf, &np);
break;
}
*npush = np;
@ -1019,6 +1027,14 @@ static int ctdb_req_control_data_pull(uint8_t *buf, size_t buflen,
ret = ctdb_rec_buffer_pull(buf, buflen, mem_ctx,
&cd->data.recbuf, &np);
break;
case CTDB_CONTROL_DB_VACUUM:
ret = ctdb_db_vacuum_pull(buf,
buflen,
mem_ctx,
&cd->data.db_vacuum,
&np);
break;
}
if (ret != 0) {
@ -1379,6 +1395,9 @@ static size_t ctdb_reply_control_data_len(struct ctdb_reply_control_data *cd)
case CTDB_CONTROL_VACUUM_FETCH:
break;
case CTDB_CONTROL_DB_VACUUM:
break;
}
return len;
@ -1536,6 +1555,9 @@ static void ctdb_reply_control_data_push(struct ctdb_reply_control_data *cd,
case CTDB_CONTROL_VACUUM_FETCH:
break;
case CTDB_CONTROL_DB_VACUUM:
break;
}
*npush = np;
@ -1723,6 +1745,9 @@ static int ctdb_reply_control_data_pull(uint8_t *buf, size_t buflen,
case CTDB_CONTROL_VACUUM_FETCH:
break;
case CTDB_CONTROL_DB_VACUUM:
break;
}
if (ret != 0) {

1
ctdb/protocol/protocol_debug.c
View File

@ -243,6 +243,7 @@ static void ctdb_opcode_print(uint32_t opcode, FILE *fp)
{ CTDB_CONTROL_TUNNEL_REGISTER, "TUNNEL_REGISTER" },
{ CTDB_CONTROL_TUNNEL_DEREGISTER, "TUNNEL_DEREGISTER" },
{ CTDB_CONTROL_VACUUM_FETCH, "VACUUM_FETCH" },
{ CTDB_CONTROL_DB_VACUUM, "DB_VACUUM" },
{ MAP_END, "" },
};

2
ctdb/tests/UNIT/cunit/protocol_test_101.sh
View File

@ -2,7 +2,7 @@
. "${TEST_SCRIPTS_DIR}/unit.sh"
last_control=154
last_control=155
generate_control_output ()
{

15
ctdb/tests/src/protocol_common_ctdb.c
View File

@ -594,6 +594,12 @@ void fill_ctdb_req_control_data(TALLOC_CTX *mem_ctx,
assert(cd->data.recbuf != NULL);
fill_ctdb_rec_buffer(mem_ctx, cd->data.recbuf);
break;
case CTDB_CONTROL_DB_VACUUM:
cd->data.db_vacuum = talloc(mem_ctx, struct ctdb_db_vacuum);
assert(cd->data.db_vacuum != NULL);
fill_ctdb_db_vacuum(mem_ctx, cd->data.db_vacuum);
break;
}
}
@ -984,6 +990,10 @@ void verify_ctdb_req_control_data(struct ctdb_req_control_data *cd,
case CTDB_CONTROL_VACUUM_FETCH:
verify_ctdb_rec_buffer(cd->data.recbuf, cd2->data.recbuf);
break;
case CTDB_CONTROL_DB_VACUUM:
verify_ctdb_db_vacuum(cd->data.db_vacuum, cd2->data.db_vacuum);
break;
}
}
@ -1381,6 +1391,8 @@ void fill_ctdb_reply_control_data(TALLOC_CTX *mem_ctx,
case CTDB_CONTROL_VACUUM_FETCH:
break;
case CTDB_CONTROL_DB_VACUUM:
break;
}
}
@ -1718,6 +1730,9 @@ void verify_ctdb_reply_control_data(struct ctdb_reply_control_data *cd,
case CTDB_CONTROL_VACUUM_FETCH:
break;
case CTDB_CONTROL_DB_VACUUM:
break;
}
}

2
ctdb/tests/src/protocol_ctdb_test.c
View File

@ -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 155
#define NUM_CONTROLS 156
PROTOCOL_CTDB2_TEST(struct ctdb_req_control_data, ctdb_req_control_data);
PROTOCOL_CTDB2_TEST(struct ctdb_reply_control_data, ctdb_reply_control_data);