sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

ctdb-recovery: Drop passing of capabilities into database pull

Browse Source 
This is no longer necessary because the capability new style database
pull is assumed to always be available.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2020-08-06 21:47:09 +10:00 committed by Amitay Isaacs
parent 595c1a7c0f
commit 225a699633
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ctdb/server/ctdb_recovery_helper.c
View File

@ -726,7 +726,7 @@ static struct tevent_req *pull_database_send(
TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct ctdb_client_context *client,
uint32_t pnn, uint32_t caps,
uint32_t pnn,
struct recdb_context *recdb)
{
struct tevent_req *req, *subreq;
@ -1326,7 +1326,6 @@ static void collect_highseqnum_db_seqnum_done(struct tevent_req *subreq)
unsigned int i;
int ret;
uint64_t seqnum, max_seqnum;
uint32_t max_caps;
status = ctdb_client_control_multi_recv(subreq, &ret, state,
&err_list, &reply);
@ -1354,7 +1353,6 @@ static void collect_highseqnum_db_seqnum_done(struct tevent_req *subreq)
max_seqnum = 0;
state->max_pnn = state->nlist->pnn_list[0];
max_caps = state->nlist->caps[0];
for (i=0; i<state->nlist->count; i++) {
ret = ctdb_reply_control_get_db_seqnum(reply[i], &seqnum);
if (ret != 0) {
@ -1365,7 +1363,6 @@ static void collect_highseqnum_db_seqnum_done(struct tevent_req *subreq)
if (max_seqnum < seqnum) {
max_seqnum = seqnum;
state->max_pnn = state->nlist->pnn_list[i];
max_caps = state->nlist->caps[i];
}
}
@ -1378,7 +1375,6 @@ static void collect_highseqnum_db_seqnum_done(struct tevent_req *subreq)
state->ev,
state->client,
state->max_pnn,
max_caps,
state->recdb);
if (tevent_req_nomem(subreq, req)) {
return;
@ -1457,7 +1453,6 @@ static struct tevent_req *collect_all_db_send(
ev,
client,
nlist->pnn_list[state->index],
nlist->caps[state->index],
recdb);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
@ -1495,7 +1490,6 @@ static void collect_all_db_pulldb_done(struct tevent_req *subreq)
state->ev,
state->client,
state->nlist->pnn_list[state->index],
state->nlist->caps[state->index],
state->recdb);
if (tevent_req_nomem(subreq, req)) {
return;