shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-10-27 10:25:13 +03:00
Code Releases Activity

Make lvmetad report the VG ID and status (complete, partial) in reply to pv_add

Browse Source 
requests.
This commit is contained in:
Petr Rockai 2011-07-20 15:14:17 +00:00
parent 2ef620ec7f
commit c33d33bab7
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
daemons/lvmetad/lvmetad-core.c
View File

@ -4,7 +4,6 @@
#include <malloc.h>
#include <stdint.h>
#include "metadata-exported.h"
#include "../common/daemon-server.h"
typedef struct {
@ -99,6 +98,25 @@ static void update_pv_status_in_vg(lvmetad_state *s, struct config_tree *vg)
}
}
static int vg_status(lvmetad_state *s, const char *vgid)
{
struct config_tree *vg = dm_hash_lookup(s->vgs, vgid);
struct config_node *pv = find_config_node(vg->root, "metadata/physical_volumes");
if (pv)
pv = pv->child;
while (pv) {
const char *uuid = find_config_str(pv->child, "id", "N/A");
const char *vgid = find_config_str(vg->root, "metadata/id", "N/A");
int found = dm_hash_lookup(s->pvs, uuid) ? 1 : 0;
if (!found)
return 0;
pv = pv->sib;
}
return 1;
}
/*
* Walk through metadata cache and update PV flags to reflect our current
* picture of the PVs in the system. If pvid is non-NULL, this is used as a hint
@ -163,7 +181,7 @@ static response pv_add(lvmetad_state *s, request r)
{
struct config_node *metadata = find_config_node(r.cft->root, "metadata");
const char *pvid = daemon_request_str(r, "uuid", NULL);
fprintf(stderr, "[D] pv_add buffer: %s\n", r.buffer);
const char *vgid = daemon_request_str(r, "metadata/id", NULL);
if (!pvid)
return daemon_reply_simple("failed", "reason = %s", "need PV UUID", NULL);
@ -171,7 +189,6 @@ static response pv_add(lvmetad_state *s, request r)
dm_hash_insert(s->pvs, pvid, 1);
if (metadata) {
const char *vgid = daemon_request_str(r, "metadata/id", NULL);
if (!vgid)
return daemon_reply_simple("failed", "reason = %s", "need VG UUID", NULL);
if (daemon_request_int(r, "metadata/seqno", -1) < 0)
@ -180,11 +197,18 @@ static response pv_add(lvmetad_state *s, request r)
if (!update_metadata(s, vgid, metadata))
return daemon_reply_simple("failed", "reason = %s",
"metadata update failed", NULL);
} else {
// TODO: find the corresponding VGID when available to give to
// the caller, and to find out whether the VG is complete
}
update_pv_status(s, NULL);
int complete = vgid ? vg_status(s, vgid) : 0;
return daemon_reply_simple("OK", NULL);
return daemon_reply_simple("OK",
"status = %s", complete ? "complete" : "partial",
vgid ? "vgid = %s" : "", vgid,
NULL);
}
static void pv_del(lvmetad_state *s, request r)