shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

lvmetad: In pvscan --cache, update the token directly.

Browse Source
This commit is contained in:
Petr Rockai 2012-10-08 12:21:36 +02:00 committed by Petr Ročkai
parent 40182cbd82
commit 582a344cd6
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/cache/lvmetad.c vendored
View File

@ -102,7 +102,6 @@ static daemon_reply _lvmetad_send(const char *id, ...)
daemon_reply repl, token_set;
daemon_request req;
int try = 0;
char *future_token;
retry:
req = daemon_request_make(id);
@ -118,20 +117,14 @@ retry:
daemon_request_destroy(req);
if (!repl.error && !strcmp(daemon_reply_str(repl, "response", ""), "token_mismatch") && try < 2 && !test_mode()) {
future_token = _lvmetad_token;
_lvmetad_token = (char *) "update in progress";
if (!_token_update()) goto out;
if (!repl.error && !strcmp(daemon_reply_str(repl, "response", ""), "token_mismatch") &&
try < 2 && !test_mode()) {
if (lvmetad_pvscan_all_devs(_lvmetad_cmd, NULL)) {
_lvmetad_token = future_token;
if (!_token_update()) goto out;
}
_lvmetad_token = future_token;
++ try;
daemon_reply_destroy(repl);
goto retry;
}
}
out:
return repl;
@ -858,22 +851,28 @@ int lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler handler)
struct device *dev;
daemon_reply reply;
int r = 1;
char *future_token;
if (!(iter = dev_iter_create(cmd->lvmetad_filter, 1))) {
log_error("dev_iter creation failed");
return 0;
}
future_token = _lvmetad_token;
_lvmetad_token = (char *) "update in progress";
if (!_token_update()) {
_lvmetad_token = future_token;
return 0;
}
reply = _lvmetad_send("pv_clear_all", NULL);
if (!_lvmetad_handle_reply(reply, "clear status on all PVs", "", NULL))
r = 0;
daemon_reply_destroy(reply);
while ((dev = dev_iter_get(iter))) {
if (!lvmetad_pvscan_single(cmd, dev, handler)) {
if (!lvmetad_pvscan_single(cmd, dev, handler))
r = 0;
break;
}
if (sigint_caught())
break;
@ -881,6 +880,10 @@ int lvmetad_pvscan_all_devs(struct cmd_context *cmd, activation_handler handler)
dev_iter_destroy(iter);
_lvmetad_token = future_token;
if (!_token_update())
return 0;
return r;
}