* [PATCH 01/25] Remove const from volume_group* in process_each
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
@ 2010-03-17 13:46 ` Zdenek Kabelac
2010-03-18 13:39 ` Alasdair G Kergon
2010-03-17 13:46 ` [PATCH 02/25] Replicator: add libdm support Zdenek Kabelac
` (23 subsequent siblings)
24 siblings, 1 reply; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:46 UTC (permalink / raw)
To: lvm-devel
struct volume_group could change as a result of process_single()
so vg is not const.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
tools/toollib.c | 2 +-
tools/toollib.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/toollib.c b/tools/toollib.c
index 0d3fe0a..972d077 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -83,7 +83,7 @@ char *skip_dev_dir(struct cmd_context *cmd, const char *vg_name,
* Metadata iteration functions
*/
int process_each_lv_in_vg(struct cmd_context *cmd,
- const struct volume_group *vg,
+ struct volume_group *vg,
const struct dm_list *arg_lvnames,
const struct dm_list *tags,
void *handle,
diff --git a/tools/toollib.h b/tools/toollib.h
index 4743fd5..d284de4 100644
--- a/tools/toollib.h
+++ b/tools/toollib.h
@@ -76,7 +76,7 @@ typedef int (*process_single_lv_fn_t) (struct cmd_context *cmd,
void *handle);
int process_each_lv_in_vg(struct cmd_context *cmd,
- const struct volume_group *vg,
+ struct volume_group *vg,
const struct dm_list *arg_lvnames,
const struct dm_list *tags,
void *handle,
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 02/25] Replicator: add libdm support
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
2010-03-17 13:46 ` [PATCH 01/25] Remove const from volume_group* in process_each Zdenek Kabelac
@ 2010-03-17 13:46 ` Zdenek Kabelac
2010-03-17 13:46 ` [PATCH 03/25] Replicator: suspend/deactivate replicator Zdenek Kabelac
` (22 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:46 UTC (permalink / raw)
To: lvm-devel
Introducing dm_tree_node_add_replicator_target() and
dm_tree_node_add_replicator_dev_target().
Define typedef dm_replicator_mode_t
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
libdm/.exported_symbols | 2 +
libdm/libdevmapper.h | 31 +++++
libdm/libdm-deptree.c | 297 ++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 325 insertions(+), 5 deletions(-)
diff --git a/libdm/.exported_symbols b/libdm/.exported_symbols
index fd9d0b9..eaa4579 100644
--- a/libdm/.exported_symbols
+++ b/libdm/.exported_symbols
@@ -80,6 +80,8 @@ dm_tree_node_add_crypt_target
dm_tree_node_add_mirror_target
dm_tree_node_add_mirror_target_log
dm_tree_node_add_target_area
+dm_tree_node_add_replicator_target
+dm_tree_node_add_replicator_dev_target
dm_tree_node_set_read_ahead
dm_tree_skip_lockfs
dm_tree_use_no_flush_suspend
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 1ae930f..3836481 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -439,6 +439,37 @@ int dm_tree_node_add_mirror_target_log(struct dm_tree_node *node,
const char *log_uuid,
unsigned area_count,
uint32_t flags);
+
+/* Replicator operation mode */
+typedef enum {
+ DM_REPLICATOR_SYNC, /* Synchronous replication */
+ DM_REPLICATOR_ASYNC_WARN, /* Warn if async replicator is slow */
+ DM_REPLICATOR_ASYNC_STALL, /* Stall replicator if not fast enough */
+ DM_REPLICATOR_ASYNC_DROP, /* Drop sites out of sync */
+ DM_REPLICATOR_ASYNC_FAIL, /* Fail replicator if slow */
+ NUM_DM_REPLICATOR_MODES
+} dm_replicator_mode_t;
+
+int dm_tree_node_add_replicator_target(struct dm_tree_node *node,
+ uint64_t size,
+ const char *rlog_uuid,
+ const char *rlog_type,
+ unsigned rsite_index,
+ dm_replicator_mode_t mode,
+ uint32_t async_timeout,
+ uint64_t fall_behind_data,
+ uint32_t fall_behind_ios);
+
+int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node,
+ uint64_t size,
+ const char *replicator_uuid, /* Replicator control device */
+ uint64_t rdevice_index,
+ const char *rdev_uuid, /* Rimage device name/uuid */
+ unsigned rsite_index,
+ const char *slog_uuid,
+ uint32_t slog_flags, /* Mirror log flags */
+ uint32_t slog_region_size);
+
int dm_tree_node_add_target_area(struct dm_tree_node *node,
const char *dev_name,
const char *dlid,
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 6df912d..6957116 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -33,6 +33,8 @@ enum {
SEG_ERROR,
SEG_LINEAR,
SEG_MIRRORED,
+ SEG_REPLICATOR,
+ SEG_REPLICATOR_DEV,
SEG_SNAPSHOT,
SEG_SNAPSHOT_ORIGIN,
SEG_SNAPSHOT_MERGE,
@@ -50,6 +52,8 @@ struct {
{ SEG_ERROR, "error" },
{ SEG_LINEAR, "linear" },
{ SEG_MIRRORED, "mirror" },
+ { SEG_REPLICATOR, "replicator" },
+ { SEG_REPLICATOR_DEV, "replicator-dev" },
{ SEG_SNAPSHOT, "snapshot" },
{ SEG_SNAPSHOT_ORIGIN, "snapshot-origin" },
{ SEG_SNAPSHOT_MERGE, "snapshot-merge" },
@@ -64,6 +68,23 @@ struct seg_area {
struct dm_tree_node *dev_node;
uint64_t offset;
+
+ unsigned rsite_index; /* Replicator site index */
+ struct dm_tree_node *slog; /* Replicator sync log node */
+ uint64_t region_size; /* Replicator sync log size */
+ uint32_t flags; /* Replicator sync log flags */
+};
+
+/* Replicator-log has a list of sites */
+/* CHECKME: maybe move to seg_area too? */
+struct replicator_site {
+ struct dm_list list;
+
+ unsigned rsite_index;
+ dm_replicator_mode_t mode;
+ uint32_t async_timeout;
+ uint32_t fall_behind_ios;
+ uint64_t fall_behind_data;
};
/* Per-segment properties */
@@ -74,8 +95,8 @@ struct load_segment {
uint64_t size;
- unsigned area_count; /* Linear + Striped + Mirrored + Crypt */
- struct dm_list areas; /* Linear + Striped + Mirrored + Crypt */
+ unsigned area_count; /* Linear + Striped + Mirrored + Crypt + Replicator */
+ struct dm_list areas; /* Linear + Striped + Mirrored + Crypt + Replicator */
uint32_t stripe_size; /* Striped */
@@ -85,7 +106,7 @@ struct load_segment {
struct dm_tree_node *origin; /* Snapshot + Snapshot origin */
struct dm_tree_node *merge; /* Snapshot */
- struct dm_tree_node *log; /* Mirror */
+ struct dm_tree_node *log; /* Mirror + Replicator */
uint32_t region_size; /* Mirror */
unsigned clustered; /* Mirror */
unsigned mirror_area_count; /* Mirror */
@@ -97,6 +118,13 @@ struct load_segment {
const char *iv; /* Crypt */
uint64_t iv_offset; /* Crypt */
const char *key; /* Crypt */
+
+ const char *rlog_type; /* Replicator */
+ struct dm_list rsites; /* Replicator */
+ unsigned rsite_count; /* Replicator */
+ unsigned rdevice_count; /* Replicator */
+ struct dm_tree_node *replicator;/* Replicator-dev */
+ uint64_t rdevice_index; /* Replicator-dev */
};
/* Per-device properties */
@@ -1319,13 +1347,51 @@ static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
struct seg_area *area;
char devbuf[DM_FORMAT_DEV_BUFSIZE];
unsigned first_time = 1;
+ const char *logtype;
+ unsigned log_parm_count;
dm_list_iterate_items(area, &seg->areas) {
if (!_build_dev_string(devbuf, sizeof(devbuf), area->dev_node))
return_0;
- EMIT_PARAMS(*pos, "%s%s %" PRIu64, first_time ? "" : " ",
- devbuf, area->offset);
+ switch (seg->type) {
+ case SEG_REPLICATOR_DEV:
+ EMIT_PARAMS(*pos, " %d 1 %s", area->rsite_index, devbuf);
+ if (first_time)
+ EMIT_PARAMS(*pos, " nolog 0");
+ else {
+ /* Remote devices */
+ log_parm_count = (area->flags &
+ (DM_NOSYNC | DM_FORCESYNC)) ? 2 : 1;
+
+ if (!area->slog) {
+ devbuf[0] = 0; /* Only core log parameters */
+ logtype = "core";
+ } else {
+ devbuf[0] = ' '; /* Extra space before device name */
+ if (!_build_dev_string(devbuf + 1,
+ sizeof(devbuf) - 1,
+ area->slog))
+ return_0;
+ logtype = "disk";
+ log_parm_count++; /* Extra sync log device name parameter */
+ }
+
+ EMIT_PARAMS(*pos, " %s %u%s %" PRIu64, logtype,
+ log_parm_count, devbuf, area->region_size);
+
+ logtype = (area->flags & DM_NOSYNC) ?
+ " nosync" : (area->flags & DM_FORCESYNC) ?
+ " sync" : NULL;
+
+ if (logtype)
+ EMIT_PARAMS(*pos, logtype);
+ }
+ break;
+ default:
+ EMIT_PARAMS(*pos, "%s%s %" PRIu64, first_time ? "" : " ",
+ devbuf, area->offset);
+ }
first_time = 0;
}
@@ -1333,6 +1399,42 @@ static int _emit_areas_line(struct dm_task *dmt __attribute((unused)),
return 1;
}
+static int _replicator_emit_segment_line(const struct load_segment *seg, char *params,
+ size_t paramsize, int *pos)
+{
+ const struct load_segment *rlog_seg;
+ struct replicator_site *rsite;
+ char rlogbuf[DM_FORMAT_DEV_BUFSIZE];
+ unsigned parm_count;
+
+ if (!seg->log || !_build_dev_string(rlogbuf, sizeof(rlogbuf), seg->log))
+ return_0;
+
+ rlog_seg = dm_list_item(dm_list_last(&seg->log->props.segs),
+ struct load_segment);
+
+ EMIT_PARAMS(*pos, "%s 4 %s 0 auto %" PRIu64,
+ seg->rlog_type, rlogbuf, rlog_seg->size);
+
+ dm_list_iterate_items(rsite, &seg->rsites) {
+ parm_count = (rsite->fall_behind_data
+ || rsite->fall_behind_ios
+ || rsite->async_timeout) ? 4 : 2;
+
+ EMIT_PARAMS(*pos, " blockdev %u %u %s", parm_count, rsite->rsite_index,
+ (rsite->mode == DM_REPLICATOR_SYNC) ? "synchronous" : "asynchronous");
+
+ if (rsite->fall_behind_data)
+ EMIT_PARAMS(*pos, " data %" PRIu64, rsite->fall_behind_data);
+ else if (rsite->fall_behind_ios)
+ EMIT_PARAMS(*pos, " ios %" PRIu32, rsite->fall_behind_ios);
+ else if (rsite->async_timeout)
+ EMIT_PARAMS(*pos, " timeout %" PRIu32, rsite->async_timeout);
+ }
+
+ return 1;
+}
+
/*
* Returns: 1 on success, 0 on failure
*/
@@ -1476,6 +1578,21 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
if (!r)
return_0;
break;
+ case SEG_REPLICATOR:
+ if ((r = _replicator_emit_segment_line(seg, params, paramsize,
+ &pos)) <= 0) {
+ stack;
+ return r;
+ }
+ break;
+ case SEG_REPLICATOR_DEV:
+ if (!seg->replicator || !_build_dev_string(originbuf,
+ sizeof(originbuf),
+ seg->replicator))
+ return_0;
+
+ EMIT_PARAMS(pos, "%s %" PRIu64, originbuf, seg->rdevice_index);
+ break;
case SEG_SNAPSHOT:
case SEG_SNAPSHOT_MERGE:
if (!_build_dev_string(originbuf, sizeof(originbuf), seg->origin))
@@ -1504,6 +1621,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
switch(seg->type) {
case SEG_ERROR:
+ case SEG_REPLICATOR:
case SEG_SNAPSHOT:
case SEG_SNAPSHOT_ORIGIN:
case SEG_SNAPSHOT_MERGE:
@@ -1511,6 +1629,7 @@ static int _emit_segment_line(struct dm_task *dmt, uint32_t major,
break;
case SEG_CRYPT:
case SEG_LINEAR:
+ case SEG_REPLICATOR_DEV:
case SEG_STRIPED:
if ((r = _emit_areas_line(dmt, seg, params, paramsize, &pos)) <= 0) {
stack;
@@ -1665,6 +1784,9 @@ int dm_tree_preload_children(struct dm_tree_node *dnode,
}
}
+ if (child->activation_priority != 0)
+ continue;
+
/* Propagate device size change change */
if (child->props.size_changed)
dnode->props.size_changed = 1;
@@ -1973,6 +2095,171 @@ int dm_tree_node_add_mirror_target(struct dm_tree_node *node,
return 1;
}
+int dm_tree_node_add_replicator_target(struct dm_tree_node *node,
+ uint64_t size,
+ const char *rlog_uuid,
+ const char *rlog_type,
+ unsigned rsite_index,
+ dm_replicator_mode_t mode,
+ uint32_t async_timeout,
+ uint64_t fall_behind_data,
+ uint32_t fall_behind_ios)
+{
+ struct load_segment *rseg;
+ struct replicator_site *rsite;
+
+ /* Local site0 - adds replicator segment and links rlog device */
+ if (rsite_index == 0) {
+ if (node->props.segment_count) {
+ log_error(INTERNAL_ERROR "Attempt to add replicator segment to already used node.");
+ return 0;
+ }
+
+ if (!(rseg = _add_segment(node, SEG_REPLICATOR, size)))
+ return_0;
+
+ if (!(rseg->log = dm_tree_find_node_by_uuid(node->dtree, rlog_uuid))) {
+ log_error("Missing replicator log uuid %s.", rlog_uuid);
+ return 0;
+ }
+
+ if (!_link_tree_nodes(node, rseg->log))
+ return_0;
+
+ if (strcmp(rlog_type, "ringbuffer") != 0) {
+ log_error("Unsupported rlog type %s.", rlog_type);
+ return 0;
+ }
+
+ if (!(rseg->rlog_type = dm_pool_strdup(node->dtree->mem, rlog_type)))
+ return_0;
+
+ dm_list_init(&rseg->rsites);
+ rseg->rdevice_count = 0;
+ node->activation_priority = 1;
+ }
+
+ /* Add site to segment */
+ if (mode == DM_REPLICATOR_SYNC
+ && (async_timeout || fall_behind_ios || fall_behind_data)) {
+ log_error("Async parameters passed for synchronnous replicator.");
+ return 0;
+ }
+
+ if (node->props.segment_count != 1) {
+ log_error(INTERNAL_ERROR "Attempt to add remote site area before setting replog.");
+ return 0;
+ }
+
+ rseg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment);
+ if (rseg->type != SEG_REPLICATOR) {
+ log_error(INTERNAL_ERROR "Attempt to use non replicator segment %s.",
+ dm_segtypes[rseg->type].target);
+ return 0;
+ }
+
+ if (!(rsite = dm_pool_zalloc(node->dtree->mem, sizeof(*rsite)))) {
+ log_error("Failed to allocate remote site segment.");
+ return 0;
+ }
+
+ dm_list_add(&rseg->rsites, &rsite->list);
+ rseg->rsite_count++;
+
+ rsite->mode = mode;
+ rsite->async_timeout = async_timeout;
+ rsite->fall_behind_data = fall_behind_data;
+ rsite->fall_behind_ios = fall_behind_ios;
+ rsite->rsite_index = rsite_index;
+
+ return 1;
+}
+
+/* Appends device node to Replicator */
+int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node,
+ uint64_t size,
+ const char *replicator_uuid,
+ uint64_t rdevice_index,
+ const char *rdev_uuid,
+ unsigned rsite_index,
+ const char *slog_uuid,
+ uint32_t slog_flags,
+ uint32_t slog_region_size)
+{
+ struct seg_area *area;
+ struct load_segment *rseg;
+ struct load_segment *rep_seg;
+
+ if (rsite_index == 0) {
+ /* Site index for local target */
+ if (!(rseg = _add_segment(node, SEG_REPLICATOR_DEV, size)))
+ return_0;
+
+ if (!(rseg->replicator = dm_tree_find_node_by_uuid(node->dtree, replicator_uuid))) {
+ log_error("Missing replicator uuid %s.", replicator_uuid);
+ return 0;
+ }
+
+ /* Local slink 0 for replicator must be always initialized first */
+ if (rseg->replicator->props.segment_count != 1) {
+ log_error(INTERNAL_ERROR "Attempt to use non replicator segment.");
+ return 0;
+ }
+
+ rep_seg = dm_list_item(dm_list_last(&rseg->replicator->props.segs), struct load_segment);
+ if (rep_seg->type != SEG_REPLICATOR) {
+ log_error(INTERNAL_ERROR "Attempt to use non replicator segment %s.",
+ dm_segtypes[rep_seg->type].target);
+ return 0;
+ }
+ rep_seg->rdevice_count++;
+
+ if (!_link_tree_nodes(node, rseg->replicator))
+ return_0;
+
+ rseg->rdevice_index = rdevice_index;
+ } else {
+ if (node->props.segment_count != 1) {
+ /* Local slink 0 for replicator must be always initialized first */
+ log_error(INTERNAL_ERROR "Attempt to use non replicator-dev segment.");
+ return 0;
+ }
+
+ rseg = dm_list_item(dm_list_last(&node->props.segs), struct load_segment);
+ if (rseg->type != SEG_REPLICATOR_DEV) {
+ log_error(INTERNAL_ERROR "Attempt to use non replicator-dev segment %s.",
+ dm_segtypes[rseg->type].target);
+ return 0;
+ }
+ }
+
+ if (!(slog_flags & DM_CORELOG) && !slog_uuid) {
+ log_error("Unspecified sync log uuid.");
+ return 0;
+ }
+
+ if (!dm_tree_node_add_target_area(node, NULL, rdev_uuid, 0))
+ return_0;
+
+ area = dm_list_item(dm_list_last(&rseg->areas), struct seg_area);
+
+ if (!(slog_flags & DM_CORELOG)) {
+ if (!(area->slog = dm_tree_find_node_by_uuid(node->dtree, slog_uuid))) {
+ log_error("Couldn't find sync log uuid %s.", slog_uuid);
+ return 0;
+ }
+
+ if (!_link_tree_nodes(node, area->slog))
+ return_0;
+ }
+
+ area->flags = slog_flags;
+ area->region_size = slog_region_size;
+ area->rsite_index = rsite_index;
+
+ return 1;
+}
+
static int _add_area(struct dm_tree_node *node, struct load_segment *seg, struct dm_tree_node *dev_node, uint64_t offset)
{
struct seg_area *area;
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 03/25] Replicator: suspend/deactivate replicator
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
2010-03-17 13:46 ` [PATCH 01/25] Remove const from volume_group* in process_each Zdenek Kabelac
2010-03-17 13:46 ` [PATCH 02/25] Replicator: add libdm support Zdenek Kabelac
@ 2010-03-17 13:46 ` Zdenek Kabelac
2010-03-17 13:46 ` [PATCH 04/25] Replicator: add lvm support Zdenek Kabelac
` (21 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:46 UTC (permalink / raw)
To: lvm-devel
Introducing dm_tree_set_suspend_priority() for suspending replicator
control target before deactivation of replicator-dev target.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
libdm/.exported_symbols | 1 +
libdm/libdevmapper.h | 2 +
libdm/libdm-deptree.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/libdm/.exported_symbols b/libdm/.exported_symbols
index eaa4579..54e7ccb 100644
--- a/libdm/.exported_symbols
+++ b/libdm/.exported_symbols
@@ -82,6 +82,7 @@ dm_tree_node_add_mirror_target_log
dm_tree_node_add_target_area
dm_tree_node_add_replicator_target
dm_tree_node_add_replicator_dev_target
+dm_tree_set_suspend_priority
dm_tree_node_set_read_ahead
dm_tree_skip_lockfs
dm_tree_use_no_flush_suspend
diff --git a/libdm/libdevmapper.h b/libdm/libdevmapper.h
index 3836481..fac4723 100644
--- a/libdm/libdevmapper.h
+++ b/libdm/libdevmapper.h
@@ -470,6 +470,8 @@ int dm_tree_node_add_replicator_dev_target(struct dm_tree_node *node,
uint32_t slog_flags, /* Mirror log flags */
uint32_t slog_region_size);
+int dm_tree_set_suspend_priority(struct dm_tree *dtree, const char *uuid, int priority);
+
int dm_tree_node_add_target_area(struct dm_tree_node *node,
const char *dev_name,
const char *dlid,
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 6957116..885a9f9 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -160,6 +160,7 @@ struct dm_tree_node {
struct dm_list used_by; /* Nodes that use this node */
int activation_priority; /* 0 gets activated first */
+ int suspend_priority; /* 1 gets suspend first */
uint16_t udev_flags; /* Udev control flags */
@@ -682,6 +683,18 @@ void dm_tree_node_set_read_ahead(struct dm_tree_node *dnode,
dnode->props.read_ahead_flags = read_ahead_flags;
}
+int dm_tree_set_suspend_priority(struct dm_tree *dtree, const char *uuid, int priority)
+{
+ struct dm_tree_node *dnode;
+
+ if ((dnode = dm_tree_find_node_by_uuid(dtree, uuid))) {
+ log_verbose("Setting suspend priority for %s.", dnode->name);
+ dnode->suspend_priority = priority;
+ }
+
+ return 1;
+}
+
int dm_tree_add_dev(struct dm_tree *dtree, uint32_t major, uint32_t minor)
{
return _add_dev(dtree, &dtree->root, major, minor, 0) ? 1 : 0;
@@ -1041,6 +1054,52 @@ static int _suspend_node(const char *name, uint32_t major, uint32_t minor,
return r;
}
+static int _suspend_parent(struct dm_tree_node *dnode, const char *uuid_prefix,
+ size_t uuid_prefix_len)
+{
+ struct dm_info info;
+ const struct dm_info *dinfo;
+ const char *name;
+ const char *uuid;
+ struct dm_tree_link *dlink;
+
+ dm_list_iterate_items(dlink, &dnode->uses) {
+ if (!dlink->node->suspend_priority)
+ continue;
+
+ if (!(uuid = dm_tree_node_get_uuid(dlink->node))) {
+ stack;
+ continue;
+ }
+ /* Ignore if it doesn't belong to this VG */
+ if (!_uuid_prefix_matches(uuid, uuid_prefix, uuid_prefix_len))
+ continue;
+
+ if (!(dinfo = dm_tree_node_get_info(dlink->node))) {
+ stack;
+ continue;
+ }
+
+ if (dinfo->suspended)
+ continue;
+
+ if (!(name = dm_tree_node_get_name(dlink->node))) {
+ stack;
+ continue;
+ }
+
+ if (!_suspend_node(name, dinfo->major, dinfo->minor,
+ 1, 1, &info)) {
+ log_error("Unable to suspend %s (%" PRIu32
+ ":%" PRIu32 ").", name, dinfo->major,
+ dinfo->minor);
+ return 0;
+ }
+ }
+
+ return 1;
+}
+
int dm_tree_deactivate_children(struct dm_tree_node *dnode,
const char *uuid_prefix,
size_t uuid_prefix_len)
@@ -1078,6 +1137,9 @@ int dm_tree_deactivate_children(struct dm_tree_node *dnode,
!info.exists || info.open_count)
continue;
+ if (!_suspend_parent(child, uuid_prefix, uuid_prefix_len))
+ continue;
+
if (!_deactivate_node(name, info.major, info.minor,
&child->dtree->cookie, child->udev_flags)) {
log_error("Unable to deactivate %s (%" PRIu32
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 04/25] Replicator: add lvm support
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (2 preceding siblings ...)
2010-03-17 13:46 ` [PATCH 03/25] Replicator: suspend/deactivate replicator Zdenek Kabelac
@ 2010-03-17 13:46 ` Zdenek Kabelac
2010-03-17 13:46 ` [PATCH 05/25] Replicator: validate replicator segments Zdenek Kabelac
` (20 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:46 UTC (permalink / raw)
To: lvm-devel
Adding configure.in support for Replicators.
Adding basic lib lvm support for Replicators.
Adding flags REPLICATOR and REPLICATOR_LOG.
Adding segments SEG_REPLICATOR and SEG_REPLICATOR_DEV.
Adding basic methods for handling replicator metadata.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
configure.in | 17 +
lib/Makefile.in | 9 +
lib/commands/toolcontext.c | 5 +
lib/format_text/flags.c | 2 +
lib/metadata/lv_manip.c | 1 +
lib/metadata/merge.c | 14 +
lib/metadata/metadata-exported.h | 75 ++++-
lib/metadata/replicator_manip.c | 340 ++++++++++++++++
lib/metadata/segtype.h | 8 +
lib/replicator/.exported_symbols | 1 +
lib/replicator/Makefile.in | 29 ++
lib/replicator/replicator.c | 794 ++++++++++++++++++++++++++++++++++++++
12 files changed, 1294 insertions(+), 1 deletions(-)
create mode 100644 lib/metadata/replicator_manip.c
create mode 100644 lib/replicator/.exported_symbols
create mode 100644 lib/replicator/Makefile.in
create mode 100644 lib/replicator/replicator.c
diff --git a/configure.in b/configure.in
index 3473d95..31a9b3a 100644
--- a/configure.in
+++ b/configure.in
@@ -306,6 +306,21 @@ if test x$MIRRORS = xinternal; then
fi
################################################################################
+dnl -- asynchronous volume replicator inclusion type
+AC_MSG_CHECKING(whether to include replicators)
+AC_ARG_WITH(replicators, AC_HELP_STRING([--with-replicators=TYPE],
+ [Replicator support: internal/shared/none [TYPE=none] ]),
+ [REPLICATORS=$withval], [REPLICATORS="none"])
+AC_MSG_RESULT($REPLICATORS)
+
+case "$REPLICATORS" in
+ none|shared) ;;
+ internal) AC_DEFINE([REPLICATOR_INTERNAL], 1,
+ [Define to 1 to include built-in support for replicators.]) ;;
+ *) AC_MSG_ERROR([--with-replicators parameter invalid ($REPLICATORS)]) ;;
+esac
+
+################################################################################
dnl -- Disable readline
AC_MSG_CHECKING(whether to enable readline)
AC_ARG_ENABLE([readline],
@@ -1105,6 +1120,7 @@ AC_SUBST(LVM_PATCHLEVEL)
AC_SUBST(LVM_RELEASE)
AC_SUBST(LVM_RELEASE_DATE)
AC_SUBST(MIRRORS)
+AC_SUBST(REPLICATORS)
AC_SUBST(MSGFMT)
AC_SUBST(OWNER)
AC_SUBST(PKGCONFIG)
@@ -1157,6 +1173,7 @@ lib/format1/Makefile
lib/format_pool/Makefile
lib/locking/Makefile
lib/mirror/Makefile
+lib/replicator/Makefile
lib/misc/lvm-version.h
lib/snapshot/Makefile
libdm/Makefile
diff --git a/lib/Makefile.in b/lib/Makefile.in
index a2e66f3..a1bc90b 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -33,6 +33,10 @@ ifeq ("@MIRRORS@", "shared")
SUBDIRS += mirror
endif
+ifeq ("@REPLICATORS@", "shared")
+ SUBDIRS += replicator
+endif
+
SOURCES =\
activate/activate.c \
cache/lvmcache.c \
@@ -75,6 +79,7 @@ SOURCES =\
metadata/mirror.c \
metadata/pv_manip.c \
metadata/pv_map.c \
+ metadata/replicator_manip.c \
metadata/segtype.c \
metadata/snapshot_manip.c \
misc/crc.c \
@@ -130,6 +135,10 @@ ifeq ("@MIRRORS@", "internal")
SOURCES += mirror/mirrored.c
endif
+ifeq ("@REPLICATORS@", "internal")
+ SOURCES += replicator/replicator.c
+endif
+
ifeq ("@DEVMAPPER@", "yes")
SOURCES +=\
activate/dev_manager.c \
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 7aac361..118f09c 100644
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -917,6 +917,11 @@ static int _init_segtypes(struct cmd_context *cmd)
dm_list_add(&cmd->segtypes, &segtype->list);
#endif
+#ifdef REPLICATOR_INTERNAL
+ if (!init_replicator_segtype(&seglib))
+ return 0;
+#endif
+
#ifdef HAVE_LIBDL
/* Load any formats in shared libs unless static */
if (!is_static() &&
diff --git a/lib/format_text/flags.c b/lib/format_text/flags.c
index a41dc1a..994adf2 100644
--- a/lib/format_text/flags.c
+++ b/lib/format_text/flags.c
@@ -67,6 +67,8 @@ static const struct flag _lv_flags[] = {
{PARTIAL_LV, NULL, 0},
{POSTORDER_FLAG, NULL, 0},
{VIRTUAL_ORIGIN, NULL, 0},
+ {REPLICATOR, NULL, 0},
+ {REPLICATOR_LOG, NULL, 0},
{0, NULL, 0}
};
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 93fd57f..abcbcbf 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1871,6 +1871,7 @@ struct logical_volume *alloc_lv(struct dm_pool *mem)
dm_list_init(&lv->segments);
dm_list_init(&lv->tags);
dm_list_init(&lv->segs_using_this_lv);
+ dm_list_init(&lv->rsites);
return lv;
}
diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index 66e9ce0..3233d2b 100644
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -66,6 +66,8 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
int r = 1;
uint32_t area_multiplier, s;
struct seg_list *sl;
+ struct replicator_site *rsite;
+ struct replicator_device *rdev;
dm_list_iterate_items(seg, &lv->segments) {
seg_count++;
@@ -207,6 +209,18 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
if (lv == seg_lv(seg, s))
seg_found++;
}
+ if (seg_is_replicator_dev(seg)) {
+ dm_list_iterate_items(rsite, &seg->replicator->rsites) {
+ dm_list_iterate_items(rdev, &rsite->rdevices) {
+ if (lv == rdev->lv || lv == rdev->slog)
+ seg_found++;
+ }
+ }
+ if (lv == seg->replicator)
+ seg_found++;
+ }
+ if (seg_is_replicator(seg) && lv == seg->rlog_lv)
+ seg_found++;
if (seg->log_lv == lv)
seg_found++;
if (!seg_found) {
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 2f1405f..cc4221e 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -72,6 +72,9 @@
#define MERGING 0x10000000U /* LV SEG */
+#define REPLICATOR 0x20000000U /* LV -internal use only for replicator/replicator-dev */
+#define REPLICATOR_LOG 0x40000000U /* LV -internal use only for replicator/replicator-dev */
+
#define LVM_READ 0x00000100U /* LV VG */
#define LVM_WRITE 0x00000200U /* LV VG */
#define CLUSTERED 0x00000400U /* VG */
@@ -280,6 +283,47 @@ struct lv_segment_area {
};
struct segment_type;
+
+/* ++ replicator datatypes */
+typedef enum {
+ REPLICATOR_STATE_PASSIVE,
+ REPLICATOR_STATE_ACTIVE,
+ NUM_REPLICATOR_STATE
+} replicator_state_t;
+
+struct replicator_site {
+ struct dm_list list; /* Chained list of sites */
+ struct dm_list rdevices; /* Device list */
+
+ struct logical_volume *replicator; /* Reference to replicator */
+
+ const char *name; /* Site name */
+ //struct id vgid; /* CHECKME: VG id */
+ const char *vg_name; /* VG name */
+ struct volume_group *vg; /* resolved vg (activate/deactive) */
+ unsigned site_index;
+ replicator_state_t state; /* Active or pasive state of site */
+ dm_replicator_mode_t op_mode; /* Operation mode sync or async fail|warn|drop|stall */
+ uint64_t fall_behind_data; /* Bytes */
+ uint32_t fall_behind_ios; /* IO operations */
+ uint32_t fall_behind_timeout; /* Seconds */
+};
+
+struct replicator_device {
+ struct dm_list list; /* Chained list of devices from same site */
+
+ struct lv_segment *replicator_dev; /* Reference to replicator-dev segment */
+ struct replicator_site *rsite; /* Reference to site parameters */
+
+ uint64_t device_index;
+ const char *name; /* Device LV name */
+ struct logical_volume *lv; /* LV from replicator site's VG */
+ struct logical_volume *slog; /* Synclog lv from VG */
+ const char *slog_name; /* Debug - specify size of core synclog */
+};
+
+/* -- replicator datatypes */
+
struct lv_segment {
struct dm_list list;
struct logical_volume *lv;
@@ -298,7 +342,7 @@ struct lv_segment {
struct logical_volume *origin;
struct logical_volume *cow;
struct dm_list origin_list;
- uint32_t region_size; /* For mirrors - in sectors */
+ uint32_t region_size; /* For mirrors, replicators - in sectors */
uint32_t extents_copied;
struct logical_volume *log_lv;
void *segtype_private;
@@ -306,6 +350,12 @@ struct lv_segment {
struct dm_list tags;
struct lv_segment_area *areas;
+
+ struct logical_volume *replicator;/* For replicator-devs - link to replicator LV */
+ struct logical_volume *rlog_lv; /* For replicators */
+ const char *rlog_type; /* For replicators */
+ uint64_t rdevice_index_highest; /* For replicators */
+ unsigned rsite_index_highest; /* For replicators */
};
#define seg_type(seg, s) (seg)->areas[(s)].type
@@ -331,6 +381,9 @@ struct logical_volume {
struct dm_list snapshot_segs;
struct lv_segment *snapshot;
+ struct replicator_device *rdevice;/* For replicator-devs, rimages, slogs - reference to rdevice */
+ struct dm_list rsites; /* For replicators - all sites */
+
struct dm_list segments;
struct dm_list tags;
struct dm_list segs_using_this_lv;
@@ -702,6 +755,26 @@ int reconfigure_mirror_images(struct lv_segment *mirrored_seg, uint32_t num_mirr
int collapse_mirrored_lv(struct logical_volume *lv);
int shift_mirror_images(struct lv_segment *mirrored_seg, unsigned mimage);
+/* ++ metadata/replicator_manip.c */
+int lvm_replicator_add_dev(struct logical_volume *replicator_lv, struct lv_segment *replicator_dev_seg);
+struct logical_volume *lvm_replicator_remove_dev(struct lv_segment *replicator_dev_seg);//MAYBE: struct replicator_device *rdev??
+int lvm_replicator_add_rlog(struct lv_segment *replicator_seg, struct logical_volume *rlog_lv);
+struct logical_volume *lvm_replicator_remove_rlog(struct lv_segment *replicator_seg);
+
+int lvm_replicator_dev_add_slog(struct replicator_device *rdev, struct logical_volume *slog_lv);
+struct logical_volume *lvm_replicator_dev_remove_slog(struct replicator_device *rdev);
+int lvm_replicator_dev_add_rimage(struct replicator_device *rdev, struct logical_volume *lv);
+struct logical_volume *lvm_replicator_dev_remove_rimage(struct replicator_device *rdev);
+
+int lv_is_active_replicator_dev(const struct logical_volume *lv);
+int lv_is_replicator(const struct logical_volume *lv);
+int lv_is_replicator_dev(const struct logical_volume *lv);
+int lv_is_rimage(const struct logical_volume *lv);
+int lv_is_rlog(const struct logical_volume *lv);
+int lv_is_slog(const struct logical_volume *lv);
+struct logical_volume *first_replicator_dev(const struct logical_volume *lv);
+/* -- metadata/replicator_manip.c */
+
struct logical_volume *find_pvmove_lv(struct volume_group *vg,
struct device *dev, uint32_t lv_type);
struct logical_volume *find_pvmove_lv_from_pvname(struct cmd_context *cmd,
diff --git a/lib/metadata/replicator_manip.c b/lib/metadata/replicator_manip.c
new file mode 100644
index 0000000..8ecb3a1
--- /dev/null
+++ b/lib/metadata/replicator_manip.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright (C) 2009-2010 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include <inttypes.h>
+#include <sys/types.h>
+#include "libdevmapper.h"
+#include "str_list.h"
+
+#include "activate.h"
+#include "archiver.h"
+#include "defaults.h"
+#include "label.h"
+#include "lib.h"
+#include "locking.h"
+#include "lv_alloc.h"
+#include "lvm-string.h"
+#include "metadata.h"
+#include "segtype.h"
+#include "toolcontext.h"
+
+/* Add lv as replicator device */
+int lvm_replicator_dev_add_rimage(struct replicator_device *rdev,
+ struct logical_volume *lv)
+{
+ if (!lv || !rdev)
+ return_0;
+
+ if (lv_is_rimage(lv)) {
+ log_error("Logical volume %s is already part of other "
+ "replicator.", lv->name);
+ return 0;
+ }
+
+ if (rdev->lv) {
+ log_error("Logical volume %s can not be attached to an "
+ "already defined replicator_device", lv->name);
+ return 0;
+ }
+
+ lv_set_hidden(lv);
+ lv->rdevice = rdev;
+ rdev->lv = lv;
+
+ return add_seg_to_segs_using_this_lv(lv, rdev->replicator_dev);
+}
+
+/* Remove lv from replicator device */
+struct logical_volume *lvm_replicator_dev_remove_rimage(struct replicator_device *rdev)
+{
+ struct logical_volume *lv;
+
+ if (!rdev || !rdev->lv)
+ return_NULL;
+
+ lv = rdev->lv;
+ if (!remove_seg_from_segs_using_this_lv(lv, rdev->replicator_dev))
+ return_NULL;
+
+ /* FIXME: - check for site references */
+ rdev->lv = NULL;
+ lv->rdevice = NULL;
+ lv_set_visible(lv);
+
+ return lv;
+}
+
+int lvm_replicator_dev_add_slog(struct replicator_device *rdev,
+ struct logical_volume *slog)
+{
+ if (!slog || !rdev)
+ return_0;
+
+ if (rdev->slog) {
+ log_error("Replicator device in site %s already has sync log.",
+ rdev->rsite->name);
+ return 0;
+ }
+
+ if (slog->rdevice) {
+ log_error("Sync log %s is already used by replicator %s.",
+ slog->name, slog->rdevice->rsite->replicator->name);
+ return 0;
+ }
+
+ lv_set_hidden(slog);
+ slog->rdevice = rdev;
+ rdev->slog = slog;
+
+ return add_seg_to_segs_using_this_lv(slog, rdev->replicator_dev);
+}
+
+struct logical_volume *lvm_replicator_dev_remove_slog(struct replicator_device *rdev)
+{
+ struct logical_volume *lv;
+
+ if (!rdev)
+ return_NULL;
+
+ lv = rdev->slog;
+ if (!lv) {
+ log_error("Replicator device in site %s does not have sync log.",
+ rdev->rsite->name);
+ return NULL;
+ }
+
+ if (!remove_seg_from_segs_using_this_lv(lv, rdev->replicator_dev))
+ return_NULL;
+
+ rdev->slog = NULL;
+ lv->rdevice = NULL;
+ lv_set_visible(lv);
+
+ return lv;
+}
+
+int lvm_replicator_add_dev(struct logical_volume *replicator_lv,
+ struct lv_segment *replicator_dev_seg)
+{
+ if (!replicator_lv)
+ return_0;
+
+ if (!(replicator_lv->status & REPLICATOR)) {
+ dm_list_init(&replicator_lv->rsites);
+ lv_set_hidden(replicator_lv);
+ replicator_lv->status |= REPLICATOR;
+ }
+
+ if (!replicator_dev_seg)
+ return 1;
+
+ if (replicator_dev_seg->replicator) {
+ log_error("Replicator device %s is already part of replicator.",
+ replicator_dev_seg->lv->name);
+ return 0;
+ }
+
+ replicator_dev_seg->replicator = replicator_lv;
+
+ return add_seg_to_segs_using_this_lv(replicator_lv, replicator_dev_seg);
+}
+
+/**
+ * Returns rimage ?? lv upon succeful detach of device
+ * entire LV entry should be removed by this crootall ??
+ */
+struct logical_volume *lvm_replicator_remove_dev(struct lv_segment *replicator_dev_seg)
+{
+ struct logical_volume *lv = NULL;
+
+ log_error("FIXME: not implemented.");
+#if 0
+ /* FIXME: - this is going to be complex.... */
+ if (!replicator_dev_seg)
+ return_NULL;
+
+ /* if slog or rimage - exit */
+
+ if (!remove_seg_from_segs_using_this_lv(lv, replicator_seg))
+ return_NULL;
+
+ replicator_seg->rlog_lv = NULL;
+ lv->status &= ~REPLICATOR_LOG;
+ lv_set_visible(lv);
+#endif
+
+ return lv;
+}
+
+int lvm_replicator_add_rlog(struct lv_segment *replicator_seg,
+ struct logical_volume *rlog_lv)
+{
+ if (!rlog_lv)
+ return_0;
+
+ if (rlog_lv->status & REPLICATOR_LOG) {
+ log_error("Rlog device %s is already used.", rlog_lv->name);
+ return 0;
+ }
+
+ lv_set_hidden(rlog_lv);
+ rlog_lv->status |= REPLICATOR_LOG;
+ replicator_seg->rlog_lv = rlog_lv;
+
+ return add_seg_to_segs_using_this_lv(rlog_lv, replicator_seg);
+}
+
+struct logical_volume *lvm_replicator_remove_rlog(struct lv_segment *replicator_seg)
+{
+ struct logical_volume *lv;
+
+ if (!replicator_seg)
+ return_0;
+
+ if (!(lv = replicator_seg->rlog_lv)) {
+ log_error("Replog segment %s does not have rlog.",
+ replicator_seg->lv->name);
+ return NULL;
+ }
+
+ if (!remove_seg_from_segs_using_this_lv(lv, replicator_seg))
+ return_NULL;
+
+ replicator_seg->rlog_lv = NULL;
+ lv->status &= ~REPLICATOR_LOG;
+ lv_set_visible(lv);
+
+ return lv;
+}
+
+
+#if 0
+/*
+ * Create new LV to pretend the original LV
+ * this target will have a 'replicator' segment
+ */
+int lvm_replicator_lv_add(struct logical_volume *origin, const char *rep_suffix)
+{
+ struct logical_volume *rep_lv;
+ char *name;
+ size_t slen;
+
+ if (!(name = strstr(origin->name, rep_suffix))) {
+ log_error("Failed to find replicator suffix %s in LV name %s",
+ rep_suffix, origin->name);
+ return 0;
+ }
+ slen = (size_t)(name - origin->name);
+ name = alloca(slen + 1);
+ memcpy(name, origin->name, slen);
+ name[slen] = 0;
+
+ if ((rep_lv = find_lv(origin->vg, name))) {
+ rep_lv->status |= VIRTUAL;
+ return 1;
+ }
+
+ if (!(rep_lv = lv_create_empty(name, &origin->lvid,
+ LVM_READ | LVM_WRITE | VISIBLE_LV,
+ ALLOC_INHERIT, origin->vg)))
+ return_0;
+
+ if (!lv_add_virtual_segment(rep_lv, 0, origin->le_count,
+ get_segtype_from_string(origin->vg->cmd,
+ "error")))
+ return_0;
+
+ rep_lv->status |= VIRTUAL;
+ return 1;
+}
+
+int lvm_replicator_lv_remove(struct logical_volume *lv)
+{
+ return 1;
+}
+#endif
+
+/**
+ * Is this segment part of active replicator
+ */
+int lv_is_active_replicator_dev(const struct logical_volume *lv)
+{
+ return ((lv->status & REPLICATOR) &&
+ lv->rdevice &&
+ lv->rdevice->rsite &&
+ lv->rdevice->rsite->state == REPLICATOR_STATE_ACTIVE);
+}
+
+/**
+ * Is this LV replicator control device
+ */
+int lv_is_replicator(const struct logical_volume *lv)
+{
+ return ((lv->status & REPLICATOR) &&
+ !dm_list_empty(&lv->segments) &&
+ seg_is_replicator(first_seg(lv)));
+}
+
+/**
+ * Is this LV replicator device
+ */
+int lv_is_replicator_dev(const struct logical_volume *lv)
+{
+ return ((lv->status & REPLICATOR) &&
+ !dm_list_empty(&lv->segments) &&
+ seg_is_replicator_dev(first_seg(lv)));
+}
+
+/**
+ * Is this LV replicated origin lv
+ */
+int lv_is_rimage(const struct logical_volume *lv)
+{
+ return (lv->rdevice && lv->rdevice->lv == lv);
+}
+
+/**
+ * Is this LV rlog
+ */
+int lv_is_rlog(const struct logical_volume *lv)
+{
+ return (lv->status & REPLICATOR_LOG);
+}
+
+/**
+ * Is this LV sync log
+ */
+int lv_is_slog(const struct logical_volume *lv)
+{
+ return (lv->rdevice && lv->rdevice->slog == lv);
+}
+
+/**
+ * Returns first replicator-dev in site in case the LV is replicator-dev,
+ * NULL otherwise
+ */
+struct logical_volume *first_replicator_dev(const struct logical_volume *lv)
+{
+ struct replicator_device *rdev;
+ struct replicator_site *rsite;
+
+ if (lv_is_replicator_dev(lv))
+ dm_list_iterate_items(rsite, &first_seg(lv)->replicator->rsites) {
+ dm_list_iterate_items(rdev, &rsite->rdevices)
+ return rdev->replicator_dev->lv;
+ break;
+ }
+
+ return NULL;
+}
diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index 7b31c1d..d352928 100644
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -35,9 +35,13 @@ struct dev_manager;
#define SEG_VIRTUAL 0x00000020U
#define SEG_CANNOT_BE_ZEROED 0x00000040U
#define SEG_MONITORED 0x00000080U
+#define SEG_REPLICATOR 0x00000100U
+#define SEG_REPLICATOR_DEV 0x00000200U
#define SEG_UNKNOWN 0x80000000U
#define seg_is_mirrored(seg) ((seg)->segtype->flags & SEG_AREAS_MIRRORED ? 1 : 0)
+#define seg_is_replicator(seg) ((seg)->segtype->flags & SEG_REPLICATOR ? 1 : 0)
+#define seg_is_replicator_dev(seg) ((seg)->segtype->flags & SEG_REPLICATOR_DEV ? 1 : 0)
#define seg_is_striped(seg) ((seg)->segtype->flags & SEG_AREAS_STRIPED ? 1 : 0)
#define seg_is_snapshot(seg) ((seg)->segtype->flags & SEG_SNAPSHOT ? 1 : 0)
#define seg_is_virtual(seg) ((seg)->segtype->flags & SEG_VIRTUAL ? 1 : 0)
@@ -110,6 +114,10 @@ struct segment_type *init_error_segtype(struct cmd_context *cmd);
struct segment_type *init_free_segtype(struct cmd_context *cmd);
struct segment_type *init_unknown_segtype(struct cmd_context *cmd, const char *name);
+#ifdef REPLICATOR_INTERNAL
+int init_replicator_segtype(struct segtype_library *seglib);
+#endif
+
#ifdef SNAPSHOT_INTERNAL
struct segment_type *init_snapshot_segtype(struct cmd_context *cmd);
#endif
diff --git a/lib/replicator/.exported_symbols b/lib/replicator/.exported_symbols
new file mode 100644
index 0000000..1c92c6a
--- /dev/null
+++ b/lib/replicator/.exported_symbols
@@ -0,0 +1 @@
+init_segtype
diff --git a/lib/replicator/Makefile.in b/lib/replicator/Makefile.in
new file mode 100644
index 0000000..b7c1d5d
--- /dev/null
+++ b/lib/replicator/Makefile.in
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2009-2010 Red Hat, Inc. All rights reserved.
+#
+# This file is part of LVM2.
+#
+# This copyrighted material is made available to anyone wishing to use,
+# modify, copy, or redistribute it subject to the terms and conditions
+# of the GNU General Public License v.2.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+top_builddir = @top_builddir@
+VPATH = @srcdir@
+
+SOURCES = replicator.c
+
+LIB_SHARED = liblvm2replicator.so
+LIB_VERSION = $(LIB_VERSION_LVM)
+
+include $(top_builddir)/make.tmpl
+
+install: $(LIB_SHARED)
+ $(INSTALL) -D $(OWNER) $(GROUP) -m 555 $(STRIP) $< \
+ $(libdir)/$(LIB_SHARED).$(LIB_VERSION)
+ $(LN_S) -f $(LIB_SHARED).$(LIB_VERSION) $(libdir)/$(LIB_SHARED)
diff --git a/lib/replicator/replicator.c b/lib/replicator/replicator.c
new file mode 100644
index 0000000..e691ec5
--- /dev/null
+++ b/lib/replicator/replicator.c
@@ -0,0 +1,794 @@
+/*
+ * Copyright (C) 2009-2010 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of LVM2.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License v.2.1.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+#include "lib.h"
+#include "toolcontext.h"
+#include "metadata.h"
+#include "segtype.h"
+#include "text_export.h"
+#include "text_import.h"
+#include "config.h"
+#include "activate.h"
+#include "str_list.h"
+#include "targets.h" /* build_dlid */
+#ifdef DMEVENTD
+# include "sharedlib.h"
+# include "libdevmapper-event.h"
+#endif
+
+/* Dm kernel module name for replicator */
+#define REPLICATOR_MODULE "replicator"
+#define REPLICATOR_DEV_MODULE "replicator-dev"
+
+/*
+ * Macro used as return argument - returns 0.
+ * return is left to be written in the function for better readability.
+ */
+#define SEG_LOG_ERROR(t, p...) \
+ log_error(t " segment %s of logical volume %s.", ## p, \
+ config_parent_name(sn), seg->lv->name), 0;
+
+
+/*
+ * Replicator target
+ */
+static const char *_replicator_name(const struct lv_segment *seg)
+{
+ return seg->segtype->name;
+}
+
+/* FIXME: missing implementation */
+static void _replicator_display(const struct lv_segment *seg)
+{
+ //const char *size;
+ //uint32_t s;
+
+ log_print(" Replicator");
+ if (seg->rlog_lv)
+ log_print(" Replicator volume\t%s", seg->rlog_lv->name);
+}
+
+/* Wrapper for get_config_uint32() with default value */
+static uint32_t _get_config_uint32(const struct config_node *cn,
+ const char *path,
+ uint32_t def)
+{
+ uint32_t t;
+
+ return get_config_uint32(cn, path, &t) ? t : def;
+}
+
+/* Wrapper for get_config_uint64() with default value */
+static uint64_t _get_config_uint64(const struct config_node *cn,
+ const char *path,
+ uint64_t def)
+{
+ uint64_t t;
+
+ return get_config_uint64(cn, path, &t) ? t : def;
+}
+
+
+/* Strings replicator_state_t enum */
+static const char _state_txt[NUM_REPLICATOR_STATE][8] = {
+ "passive",
+ "active"
+};
+
+/* Parse state string */
+static replicator_state_t _get_state(const struct config_node *sn,
+ const char *path, replicator_state_t def)
+{
+ char *str;
+ unsigned i;
+
+ if (get_config_str(sn, path, &str)) {
+ for (i = 0; i < sizeof(_state_txt)/sizeof(_state_txt[0]); ++i)
+ if (strcasecmp(str, _state_txt[i]) == 0)
+ return (replicator_state_t) i;
+
+ log_warn("%s: unknown value '%s', using default '%s' state",
+ path, str, _state_txt[def]);
+ }
+
+ return def;
+}
+
+/* Strings for replicator_action_t enum */
+static const char _op_mode_txt[NUM_DM_REPLICATOR_MODES][8] = {
+ "sync",
+ "warn",
+ "stall",
+ "drop",
+ "fail"
+};
+
+
+/* Parse action string */
+static dm_replicator_mode_t _get_op_mode(const struct config_node *sn,
+ const char *path, dm_replicator_mode_t def)
+{
+ char *str;
+ unsigned i;
+
+ if (get_config_str(sn, path, &str)) {
+ for (i = 0; i < sizeof(_op_mode_txt)/sizeof(_op_mode_txt[0]); ++i)
+ if (strcasecmp(str, _op_mode_txt[i]) == 0) {
+ log_very_verbose("Setting %s to %s",
+ path, _op_mode_txt[i]);
+ return (dm_replicator_mode_t) i;
+ }
+ log_warn("%s: unknown value '%s', using default '%s' operation mode",
+ path, str, _op_mode_txt[def]);
+ }
+
+ return def;
+}
+
+static struct replicator_site *_get_site(struct logical_volume *replicator,
+ const char *key)
+{
+ struct dm_pool *mem = replicator->vg->vgmem;
+ struct replicator_site *rsite;
+
+ dm_list_iterate_items(rsite, &replicator->rsites)
+ if (strcasecmp(rsite->name, key) == 0)
+ return rsite;
+
+ if (!(rsite = dm_pool_zalloc(mem, sizeof(*rsite))))
+ return_NULL;
+
+ if (!(rsite->name = dm_pool_strdup(mem, key)))
+ return_NULL;
+
+ rsite->replicator = replicator;
+ dm_list_init(&rsite->rdevices);
+ dm_list_add(&replicator->rsites, &rsite->list);
+
+ return rsite;
+}
+
+
+/* Parse replicator site element */
+static int _add_site(struct lv_segment *seg,
+ const char *key,
+ const struct config_node *sn)
+{
+ struct dm_pool *mem = seg->lv->vg->vgmem;
+ const struct config_node *cn;
+ struct replicator_site *rsite;
+
+ if (!(rsite = _get_site(seg->lv, key)))
+ return_0;
+
+ if (!find_config_node(sn, "site_index"))
+ return SEG_LOG_ERROR("Mandatory site_index is missing for");
+
+ rsite->state = _get_state(sn, "state", REPLICATOR_STATE_PASSIVE);
+ rsite->site_index = _get_config_uint32(sn, "site_index", 0);
+ if (rsite->site_index > seg->rsite_index_highest)
+ return SEG_LOG_ERROR("site_index=%d > highest_site_index=%d for",
+ rsite->site_index, seg->rsite_index_highest);
+
+ rsite->fall_behind_data = _get_config_uint64(sn, "fall_behind_data", 0);
+ rsite->fall_behind_ios = _get_config_uint32(sn, "fall_behind_ios", 0);
+ rsite->fall_behind_timeout = _get_config_uint32(sn, "fall_behind_timeout", 0);
+ rsite->op_mode = DM_REPLICATOR_SYNC;
+
+ if (rsite->fall_behind_data ||
+ rsite->fall_behind_ios ||
+ rsite->fall_behind_timeout) {
+ if (rsite->fall_behind_data && rsite->fall_behind_ios)
+ return SEG_LOG_ERROR("Defined both fall_behind_data "
+ "and fall_behind_ios in");
+
+ if (rsite->fall_behind_data && rsite->fall_behind_timeout)
+ return SEG_LOG_ERROR("Defined both fall_behind_data "
+ "and fall_behind_timeout in");
+
+ if (rsite->fall_behind_ios && rsite->fall_behind_timeout)
+ return SEG_LOG_ERROR("Defined both fall_behind_ios "
+ "and fall_behind_timeout in");
+
+ rsite->op_mode = _get_op_mode(sn, "operation_mode",
+ rsite->op_mode);
+ }
+
+ if ((cn = find_config_node(sn, "volume_group"))) {
+ if (!cn->v || cn->v->type != CFG_STRING)
+ return SEG_LOG_ERROR("volume_group must be a string in");
+
+ if (!(rsite->vg_name = dm_pool_strdup(mem, cn->v->v.str)))
+ return_0;
+
+ } else if (rsite->site_index != 0)
+ return SEG_LOG_ERROR("volume_group is mandatory for remote site in");
+
+ return 1;
+}
+
+
+/* Import replicator segment */
+static int _replicator_text_import(struct lv_segment *seg,
+ const struct config_node *sn,
+ struct dm_hash_table *pv_hash __attribute((unused)))
+{
+ const struct config_node *cn;
+ struct logical_volume *rlog_lv;
+
+ if (!lvm_replicator_add_dev(seg->lv, NULL))
+ return_0;
+
+ if (!(cn = find_config_node(sn, "replicator_log")) ||
+ !cn->v || cn->v->type != CFG_STRING)
+ return SEG_LOG_ERROR("Replicator log type must be a string in");
+
+ if (!(rlog_lv = find_lv(seg->lv->vg, cn->v->v.str)))
+ return SEG_LOG_ERROR("Unknown replicator log %s in",
+ cn->v->v.str);
+
+ if (!(cn = find_config_node(sn, "replicator_log_type")) ||
+ !cn->v || cn->v->type != CFG_STRING)
+ return SEG_LOG_ERROR("Replicator log's type must be a string in");
+ if (strcasecmp(cn->v->v.str, "ringbuffer"))
+ return SEG_LOG_ERROR("Only ringbuffer replicator log type is supported in");
+
+ if (!(seg->rlog_type = dm_pool_strdup(seg->lv->vg->vgmem, cn->v->v.str)))
+ return_0;
+
+
+ log_very_verbose("replicator_log = %s", rlog_lv->name);
+ log_very_verbose("replicator_log_type = %s", seg->rlog_type);
+
+ if (!lvm_replicator_add_rlog(seg, rlog_lv))
+ return_0;
+
+ seg->rdevice_index_highest = _get_config_uint64(sn, "highest_device_index", 0);
+ seg->rsite_index_highest = _get_config_uint32(sn, "highest_site_index", 0);
+
+ seg->region_size = _get_config_uint32(sn, "sync_log_size", 0);
+
+ for (; sn; sn = sn->sib)
+ if (!sn->v) {
+ for (cn = sn->sib; cn; cn = cn->sib)
+ if (!cn->v && (strcasecmp(cn->key ,sn->key) == 0))
+ return SEG_LOG_ERROR("Detected duplicate site "
+ "name %s in", sn->key);
+ if (!_add_site(seg, sn->key, sn->child))
+ return_0;
+ }
+ return 1;
+}
+
+/* Export replicator segment */
+static int _replicator_text_export(const struct lv_segment *seg,
+ struct formatter *f)
+{
+ struct replicator_site *rsite;
+
+ if (!seg->rlog_lv)
+ return_0;
+
+ outf(f, "replicator_log = \"%s\"", seg->rlog_lv->name);
+ outf(f, "replicator_log_type = \"%s\"", seg->rlog_type);
+ outf(f, "highest_device_index = %" PRIu64, seg->rdevice_index_highest);
+ outf(f, "highest_site_index = %d", seg->rsite_index_highest);
+
+ if (seg->region_size)
+ outsize(f, (uint64_t)seg->region_size,
+ "sync_log_size = %" PRIu32, seg->region_size);
+
+ if (!dm_list_empty(&seg->lv->rsites))
+ outnl(f);
+
+ dm_list_iterate_items(rsite, &seg->lv->rsites) {
+ outf(f, "%s {", rsite->name);
+ out_inc_indent(f);
+
+ outf(f, "state = \"%s\"", _state_txt[rsite->state]);
+ outf(f, "site_index = %d", rsite->site_index);
+
+ /* Only non-default parameters are written */
+ if (rsite->op_mode != DM_REPLICATOR_SYNC)
+ outf(f, "operation_mode = \"%s\"",
+ _op_mode_txt[rsite->op_mode]);
+ if (rsite->fall_behind_timeout)
+ outfc(f, "# seconds", "fall_behind_timeout = %u",
+ rsite->fall_behind_timeout);
+ if (rsite->fall_behind_ios)
+ outfc(f, "# io operations", "fall_behind_ios = %u",
+ rsite->fall_behind_ios);
+ if (rsite->fall_behind_data)
+ outsize(f, rsite->fall_behind_data, "fall_behind_data = %" PRIu64,
+ rsite->fall_behind_data);
+ if (rsite->state != REPLICATOR_STATE_ACTIVE && rsite->vg_name)
+ outf(f, "volume_group = \"%s\"", rsite->vg_name);
+
+ out_dec_indent(f);
+ outf(f, "}");
+ }
+
+ return 1;
+}
+
+#ifdef DEVMAPPER_SUPPORT
+static int _replicator_add_target_line(struct dev_manager *dm,
+ struct dm_pool *mem,
+ struct cmd_context *cmd,
+ void **target_state,
+ struct lv_segment *seg,
+ struct dm_tree_node *node,
+ uint64_t len,
+ uint32_t *pvmove_mirror_count)
+{
+ const char *rlog_dlid;
+ struct replicator_site *rsite;
+
+ if (!seg->rlog_lv)
+ return_0;
+
+ if (!(rlog_dlid = build_dlid(dm, seg->rlog_lv->lvid.s, NULL)))
+ return_0;
+
+ dm_list_iterate_items(rsite, &seg->lv->rsites) {
+ if (!dm_tree_node_add_replicator_target(node,
+ seg->rlog_lv->size,
+ rlog_dlid,
+ seg->rlog_type,
+ rsite->site_index,
+ rsite->op_mode,
+ rsite->fall_behind_timeout,
+ rsite->fall_behind_data,
+ rsite->fall_behind_ios)) {
+ if (rsite->site_index == 0) {
+ log_error("Failed to add replicator log '%s' "
+ "to replicator '%s'.",
+ rlog_dlid, seg->lv->name);
+ return 0;
+ }
+ // FIXME:
+ }
+ }
+
+ return 1;
+}
+
+/* FIXME: write something useful for replicator here */
+static int _replicator_target_percent(void **target_state,
+ percent_range_t *percent_range,
+ struct dm_pool *mem,
+ struct cmd_context *cmd,
+ struct lv_segment *seg,
+ char *params, uint64_t *total_numerator,
+ uint64_t *total_denominator)
+{
+ return 1;
+}
+
+/* Check for module presence */
+static int _replicator_target_present(struct cmd_context *cmd,
+ const struct lv_segment *seg __attribute((unused)),
+ unsigned *attributes __attribute((unused)))
+{
+ static int _checked = 0;
+ static int _present = 0;
+
+ if (!_checked) {
+ _present = target_present(cmd, REPLICATOR_MODULE, 1);
+ _checked = 1;
+ }
+
+ return _present;
+}
+
+#endif
+
+static int _replicator_modules_needed(struct dm_pool *mem,
+ const struct lv_segment *seg __attribute((unused)),
+ struct dm_list *modules)
+{
+ if (!str_list_add(mem, modules, REPLICATOR_MODULE))
+ return_0;
+
+ if (!str_list_add(mem, modules, REPLICATOR_DEV_MODULE))
+ return_0;
+
+ return 1;
+}
+
+static void _replicator_destroy(const struct segment_type *segtype)
+{
+ dm_free((void *)segtype);
+}
+
+static struct segtype_handler _replicator_ops = {
+ .name = _replicator_name,
+ .display = _replicator_display,
+ .text_import = _replicator_text_import,
+ .text_export = _replicator_text_export,
+#ifdef DEVMAPPER_SUPPORT
+ .add_target_line = _replicator_add_target_line,
+ .target_percent = _replicator_target_percent,
+ .target_present = _replicator_target_present,
+#endif
+ .modules_needed = _replicator_modules_needed,
+ .destroy = _replicator_destroy,
+};
+
+/*
+ * Replicator-dev target
+ */
+static void _replicator_dev_display(const struct lv_segment *seg)
+{
+ //const char *size;
+ //uint32_t s;
+ // FIXME: debug test code for now
+ log_print(" Replicator\t\t%u", seg->area_count);
+ log_print(" Mirror size\t\t%u", seg->area_len);
+ if (seg->log_lv)
+ log_print(" Replicator log volume\t%s", seg->rlog_lv->name);
+
+}
+
+static int _add_device(struct lv_segment *seg,
+ const char *site_name,
+ const struct config_node *sn,
+ uint64_t devidx)
+{
+ struct dm_pool *mem = seg->lv->vg->vgmem;
+ struct logical_volume *lv = NULL;
+ struct logical_volume *slog_lv = NULL;
+ struct replicator_site *rsite = _get_site(seg->replicator, site_name);
+ struct replicator_device *rdev;
+ const char *dev_str = NULL;
+ const char *slog_str = NULL;
+ const struct config_node *cn;
+
+ dm_list_iterate_items(rdev, &rsite->rdevices)
+ if (rdev->replicator_dev == seg)
+ return SEG_LOG_ERROR("Duplicate site found in");
+
+ if ((cn = find_config_node(sn, "sync_log"))) {
+ if (!cn->v || !cn->v->v.str)
+ return SEG_LOG_ERROR("Sync log must be a string in");
+ slog_str = cn->v->v.str;
+ }
+
+ if (!(cn = find_config_node(sn, "logical_volume")) ||
+ !cn->v || !cn->v->v.str)
+ return SEG_LOG_ERROR("Logical volume must be a string in");
+
+ dev_str = cn->v->v.str;
+
+ if (!seg->lv->rdevice) {
+ if (slog_str)
+ return SEG_LOG_ERROR("Sync log %s defined for local "
+ "device in", slog_str);
+
+ /* Check for device in current VG */
+ if (!(lv = find_lv(seg->lv->vg, dev_str)))
+ return SEG_LOG_ERROR("Logical volume %s not found in",
+ dev_str);
+ } else {
+ if (!slog_str)
+ return SEG_LOG_ERROR("Sync log is missing for remote "
+ "device in");
+ /* Check for slog device in current VG */
+ if (!(slog_lv = find_lv(seg->lv->vg, slog_str)))
+ return SEG_LOG_ERROR("Sync log %s not found in",
+ slog_str);
+ }
+
+ if (!(rdev = dm_pool_zalloc(mem, sizeof(*rdev))))
+ return_0;
+
+ if (!(rdev->name = dm_pool_strdup(mem, dev_str)))
+ return_0;
+
+ rdev->replicator_dev = seg;
+ rdev->rsite = rsite;
+ rdev->device_index = devidx;
+
+ if (!seg->lv->rdevice) {
+ if (!lvm_replicator_dev_add_rimage(rdev, lv))
+ return SEG_LOG_ERROR("LV inconsistency found in");
+ seg->lv->rdevice = rdev;
+ } else {
+ if (!slog_str ||
+ !(rdev->slog_name = dm_pool_strdup(mem, slog_str)))
+ return_0;
+
+ if (!lvm_replicator_dev_add_slog(rdev, slog_lv))
+ return SEG_LOG_ERROR("Sync log inconsistency found in");
+ }
+
+ dm_list_add(&rsite->rdevices, &rdev->list);// linked site list
+
+ return 1;
+}
+
+/* Import replicator segment */
+static int _replicator_dev_text_import(struct lv_segment *seg,
+ const struct config_node *sn,
+ struct dm_hash_table *pv_hash __attribute((unused)))
+{
+ const struct config_node *cn;
+ struct logical_volume *replicator;
+ uint64_t devidx;
+
+ if (!(cn = find_config_node(sn, "replicator")))
+ return SEG_LOG_ERROR("Replicator is missing for");
+
+ if (!cn->v || !cn->v->v.str)
+ return SEG_LOG_ERROR("Replicator must be a string for");
+
+ if (!(replicator = find_lv(seg->lv->vg, cn->v->v.str)))
+ return SEG_LOG_ERROR("Unknown replicator %s for", cn->v->v.str);
+
+ if (!lvm_replicator_add_dev(replicator, seg))
+ return_0;
+
+ log_very_verbose("replicator=%s", replicator->name);
+
+ /* Mandatory */
+ if (!find_config_node(sn, "device_index") ||
+ !get_config_uint64(sn, "device_index", &devidx))
+ return SEG_LOG_ERROR("Could not read 'device_index' for");
+
+ /* Read devices from sites */
+ for (; sn; sn = sn->sib)
+ if (!(sn->v) && !_add_device(seg, sn->key, sn->child, devidx))
+ return_0;
+
+ if (!seg->lv->rdevice)
+ return SEG_LOG_ERROR("Replicator device without site in");
+
+ seg->rlog_lv = NULL;
+ seg->lv->status |= REPLICATOR;
+
+ return 1;
+}
+
+/* Export replicator-dev segment */
+static int _replicator_dev_text_export(const struct lv_segment *seg,
+ struct formatter *f)
+{
+ struct replicator_site *rsite;
+ struct replicator_device *rdev;
+
+ if (!seg->replicator || !seg->lv->rdevice)
+ return_0;
+
+ outf(f, "replicator = \"%s\"", seg->replicator->name);
+ outf(f, "device_index = %" PRId64, seg->lv->rdevice->device_index);
+
+ outnl(f);
+
+ dm_list_iterate_items(rsite, &seg->replicator->rsites) {
+ dm_list_iterate_items(rdev, &rsite->rdevices) {
+ if (rdev->replicator_dev != seg)
+ continue;
+
+ outf(f, "%s {", rdev->rsite->name);
+
+ out_inc_indent(f);
+
+ outf(f, "logical_volume = \"%s\"",
+ rdev->name ? rdev->name : rdev->lv->name);
+
+ if (rdev->slog)
+ outf(f, "sync_log = \"%s\"", rdev->slog->name);
+ else if (rdev->slog_name)
+ outf(f, "sync_log = \"%s\"", rdev->slog_name);
+
+ out_dec_indent(f);
+
+ outf(f, "}");
+ }
+ }
+
+ return 1;
+}
+
+#ifdef DEVMAPPER_SUPPORT
+/*
+ * Add target for passive site matching the device index
+ */
+static int _replicator_dev_add_target_line(struct dev_manager *dm,
+ struct dm_pool *mem,
+ struct cmd_context *cmd,
+ void **target_state,
+ struct lv_segment *seg,
+ struct dm_tree_node *node,
+ uint64_t len,
+ uint32_t *pvmove_mirror_count)
+{
+ const char *replicator_dlid, *rdev_dlid, *slog_dlid;
+ struct replicator_device *rdev, *rdev_search;
+ struct replicator_site *rsite;
+ uint32_t slog_size;
+ uint32_t slog_flags;
+
+ if (!lv_is_active_replicator_dev(seg->lv)) {
+ /* Create passive linear mapping */
+ log_very_verbose("Inactive replicator %s using %s.",
+ seg->lv->name, seg->lv->rdevice->lv->name);
+ if (!dm_tree_node_add_linear_target(node, seg->lv->size))
+ return_0;
+ if (!(rdev_dlid = build_dlid(dm, seg->lv->rdevice->lv->lvid.s, NULL)))
+ return_0;
+ return dm_tree_node_add_target_area(node, NULL, rdev_dlid, 0);
+ } else if (seg->lv->rdevice->rsite->site_index) {
+ log_error("Active site with site_index != 0 (%s, %d)",
+ seg->lv->rdevice->rsite->name,
+ seg->lv->rdevice->rsite->site_index);
+ return 0; /* Replicator without any active site */
+ }
+
+ /*
+ * At this point all devices that have some connection with replicator
+ * must be present in dm_tree
+ */
+ if (!seg_is_replicator_dev(seg) ||
+ !(replicator_dlid = build_dlid(dm, seg->replicator->lvid.s, NULL)))
+ return_0;
+
+ /* Select remote devices with the same device index */
+ dm_list_iterate_items(rsite, &seg->replicator->rsites) {
+ if (rsite->site_index == 0) {
+ /* Local slink0 device */
+ rdev = seg->lv->rdevice;
+ } else {
+ rdev = NULL;
+ dm_list_iterate_items(rdev_search, &rsite->rdevices) {
+ if (rdev_search->replicator_dev == seg) {
+ rdev = rdev_search;
+ break;
+ }
+ }
+
+ if (!rdev) {
+ log_error(INTERNAL_ERROR "rdev list not found.");
+ return 0;
+ }
+ }
+
+ if (!rdev->lv ||
+ !(rdev_dlid = build_dlid(dm, rdev->lv->lvid.s, NULL)))
+ return_0;
+
+ slog_dlid = NULL;
+
+ /* Using either disk or core (in memory) log */
+ if (rdev->slog) {
+ slog_flags = DM_NOSYNC;
+ slog_size = (uint32_t) rdev->slog->size;
+ /* slog_size = 2048; FIXME: HACK */
+ if (!(slog_dlid = build_dlid(dm, rdev->slog->lvid.s, NULL)))
+ return_0;
+ } else if (rdev->slog_name &&
+ sscanf(rdev->slog_name, "%" PRIu32, &slog_size) == 1) {
+ slog_flags = DM_CORELOG | DM_FORCESYNC;
+ if (slog_size == 0) {
+ log_error("Failed to use empty corelog size "
+ "in replicator '%s'.",
+ rsite->replicator->name);
+ return 0;
+ }
+ } else {
+ slog_flags = DM_CORELOG | DM_FORCESYNC;
+ slog_size = 0; /* NOLOG */
+ }
+
+ if (!dm_tree_node_add_replicator_dev_target(node,
+ seg->lv->size,
+ replicator_dlid,
+ seg->lv->rdevice->device_index,
+ rdev_dlid,
+ rsite->site_index,
+ slog_dlid,
+ slog_flags,
+ slog_size)) {
+ return_0;
+ /*
+ * CHECKME: handle 'state = dropped' in future
+ */
+ }
+ }
+
+ return 1;
+}
+
+/* FIXME: write something useful for replicator-dev here */
+static int _replicator_dev_target_percent(void **target_state,
+ percent_range_t *percent_range,
+ struct dm_pool *mem,
+ struct cmd_context *cmd,
+ struct lv_segment *seg,
+ char *params,
+ uint64_t *total_numerator,
+ uint64_t *total_denominator)
+{
+ return 1;
+}
+
+/* Check for module presence */
+static int _replicator_dev_target_present(struct cmd_context *cmd,
+ const struct lv_segment *seg __attribute((unused)),
+ unsigned *attributes __attribute((unused)))
+{
+ static int _checked = 0;
+ static int _present = 0;
+
+ if (!_checked) {
+ _present = target_present(cmd, REPLICATOR_DEV_MODULE, 1);
+ _checked = 1;
+ }
+
+ return _present;
+}
+
+#endif
+
+static struct segtype_handler _replicator_dev_ops = {
+ .name = _replicator_name,
+ .display = _replicator_dev_display,
+ .text_import = _replicator_dev_text_import,
+ .text_export = _replicator_dev_text_export,
+#ifdef DEVMAPPER_SUPPORT
+ .add_target_line = _replicator_dev_add_target_line,
+ .target_percent = _replicator_dev_target_percent,
+ .target_present = _replicator_dev_target_present,
+#endif
+ .modules_needed = _replicator_modules_needed,
+ .destroy = _replicator_destroy,
+};
+
+#ifdef REPLICATOR_INTERNAL
+int init_replicator_segtype(struct segtype_library *seglib)
+#else /* Shared */
+int init_multiple_segtype(struct segtype_library *seglib);
+int init_multiple_segtype(struct segtype_library *seglib)
+#endif
+{
+ struct segment_type *segtype;
+
+ if (!(segtype = dm_malloc(sizeof(*segtype))))
+ return_0;
+
+ segtype->ops = &_replicator_ops;
+ segtype->name = REPLICATOR_MODULE;
+ segtype->private = NULL;
+ segtype->flags = SEG_REPLICATOR;
+
+ if (!lvm_register_segtype(seglib, segtype))
+ return_0;
+
+ log_very_verbose("Initialised segtype: " REPLICATOR_MODULE);
+
+ if (!(segtype = dm_malloc(sizeof(*segtype))))
+ return_0;
+
+ segtype->ops = &_replicator_dev_ops;
+ segtype->name = REPLICATOR_DEV_MODULE;
+ segtype->private = NULL;
+ segtype->flags = SEG_REPLICATOR_DEV;
+
+ if (!lvm_register_segtype(seglib, segtype))
+ return_0;
+
+ log_very_verbose("Initialised segtype: " REPLICATOR_DEV_MODULE);
+
+ return 1;
+}
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 05/25] Replicator: validate replicator segments
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (3 preceding siblings ...)
2010-03-17 13:46 ` [PATCH 04/25] Replicator: add lvm support Zdenek Kabelac
@ 2010-03-17 13:46 ` Zdenek Kabelac
2010-03-17 13:46 ` [PATCH 06/25] Replicator: extend _lv_each_dependency() rep. deps Zdenek Kabelac
` (19 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:46 UTC (permalink / raw)
To: lvm-devel
Check for possible problems within replicator structures.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/metadata.c | 158 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 158 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index dcf1aa9..a3c855c 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -2138,6 +2138,161 @@ void lv_calculate_readahead(const struct logical_volume *lv, uint32_t *read_ahea
}
}
+/*
+ * Validate replicator structures:
+ * Check for:
+ * non-clustered vg for replicator
+ * only one segment in replicator LV
+ * site has correct combination of operation_mode parameters
+ * site and devices have correct index numbers
+ * duplicate site names, site indexes, device names, device indexes
+ */
+static int _replicator_validate(const struct logical_volume *lv)
+{
+ struct replicator_site *rsite, *rsiteb;
+ struct replicator_device *rdev, *rdevb;
+ struct lv_segment *rseg;
+ int r = 1;
+
+ if (vg_is_clustered(lv->vg)) {
+ log_error(INTERNAL_ERROR "Volume Group %s of replicator %s is clustered",
+ lv->vg->name, lv->name);
+ return 0;
+ }
+
+ if (dm_list_size(&lv->segments) != 1) {
+ log_error(INTERNAL_ERROR "Replicator %s segment size %d != 1",
+ lv->name, dm_list_size(&lv->segments));
+ return 0;
+ }
+
+ rseg = first_seg(lv);
+
+ dm_list_iterate_items(rsite, &lv->rsites) {
+ if (rsite->op_mode == DM_REPLICATOR_SYNC) {
+ if (rsite->fall_behind_timeout) {
+ log_error(INTERNAL_ERROR "Defined fall_behind_timeout="
+ "%d for sync replicator %s/%s.",
+ rsite->fall_behind_timeout, lv->name,
+ rsite->name);
+ r = 0;
+ }
+ if (rsite->fall_behind_ios) {
+ log_error(INTERNAL_ERROR "Defined fall_behind_ios="
+ "%d for sync replicator %s/%s.",
+ rsite->fall_behind_ios, lv->name, rsite->name);
+ r = 0;
+ }
+ if (rsite->fall_behind_data) {
+ log_error(INTERNAL_ERROR "Defined fall_behind_data="
+ "%" PRIu64 " for sync replicator %s/%s.",
+ rsite->fall_behind_data, lv->name, rsite->name);
+ r = 0;
+ }
+ } else {
+ if (rsite->fall_behind_timeout && rsite->fall_behind_ios) {
+ log_error(INTERNAL_ERROR "Defined fall_behind_timeout and"
+ " fall_behind_ios for async replicator %s/%s.",
+ lv->name, rsite->name);
+ r = 0;
+ }
+ if (rsite->fall_behind_timeout && rsite->fall_behind_data) {
+ log_error(INTERNAL_ERROR "Defined fall_behind_timeout and"
+ " fall_behind_data for async replicator %s/%s.",
+ lv->name, rsite->name);
+ r = 0;
+ }
+ if (rsite->fall_behind_ios && rsite->fall_behind_data) {
+ log_error(INTERNAL_ERROR "Defined fall_behind_ios and"
+ " fall_behind_data for async replicator %s/%s.",
+ lv->name, rsite->name);
+ r = 0;
+ }
+ if (!rsite->fall_behind_ios && !rsite->fall_behind_data &&
+ !rsite->fall_behind_timeout) {
+ log_error(INTERNAL_ERROR "fall_behind_timeout,"
+ " fall_behind_ios and fall_behind_data are"
+ " undefined for async replicator %s/%s.",
+ lv->name, rsite->name);
+ r = 0;
+ }
+ }
+ dm_list_iterate_items(rsiteb, &lv->rsites) {
+ if (rsite == rsiteb)
+ break;
+ if (strcasecmp(rsite->name, rsiteb->name) == 0) {
+ log_error(INTERNAL_ERROR "Duplicate site name"
+ " %s detected for replicator %s.",
+ rsite->name, lv->name);
+ r = 0;
+ }
+ if ((rsite->vg_name && rsiteb->vg_name &&
+ strcasecmp(rsite->vg_name, rsiteb->vg_name) == 0) ||
+ (!rsite->vg_name && !rsiteb->vg_name)) {
+ log_error(INTERNAL_ERROR "Duplicate VG name"
+ " %s detected for replicator %s.",
+ (rsite->vg_name) ? rsite->vg_name : "<local>",
+ lv->name);
+ r = 0;
+ }
+ if (rsite->site_index == rsiteb->site_index) {
+ log_error(INTERNAL_ERROR "Duplicate site index"
+ " %d detected for replicator %s/%s.",
+ rsite->site_index, lv->name,
+ rsite->name);
+ r = 0;
+ }
+ if (rsite->site_index > rseg->rsite_index_highest) {
+ log_error(INTERNAL_ERROR "Site index %d > %d"
+ " (too high) for replicator %s/%s.",
+ rsite->site_index,
+ rseg->rsite_index_highest,
+ lv->name, rsite->name);
+ r = 0;
+ }
+ }
+
+ dm_list_iterate_items(rdev, &rsite->rdevices) {
+ dm_list_iterate_items(rdevb, &rsite->rdevices) {
+ if (rdev == rdevb)
+ break;
+ if (rdev->slog && (rdev->slog == rdevb->slog)) {
+ log_error(INTERNAL_ERROR "Duplicate "
+ "sync log %s detected for "
+ "replicator %s.",
+ rdev->slog->name, lv->name);
+ r = 0;
+ }
+ if (strcasecmp(rdev->name, rdevb->name) == 0) {
+ log_error(INTERNAL_ERROR "Duplicate "
+ "device name %s detected "
+ "for replicator %s.",
+ rdev->name, lv->name);
+ r = 0;
+ }
+ if (rdev->device_index == rdevb->device_index) {
+ log_error(INTERNAL_ERROR "Duplicate "
+ "device index %" PRId64
+ " detected for replicator "
+ "%s/%s.", rdev->device_index,
+ lv->name, rsite->name);
+ r = 0;
+ }
+ if (rdev->device_index > rseg->rdevice_index_highest) {
+ log_error(INTERNAL_ERROR "Device index %" PRIu64 " > %"
+ PRIu64 " (too high) for replicator %s/%s.",
+ rdev->device_index,
+ rseg->rdevice_index_highest,
+ lv->name, rsite->name);
+ r = 0;
+ }
+ }
+ }
+ }
+
+ return r;
+}
+
int vg_validate(struct volume_group *vg)
{
struct pv_list *pvl, *pvl2;
@@ -2238,6 +2393,9 @@ int vg_validate(struct volume_group *vg)
r = 0;
}
}
+
+ if (lv_is_replicator(lvl->lv) && !_replicator_validate(lvl->lv))
+ r = 0;
}
dm_list_iterate_items(lvl, &vg->lvs) {
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 06/25] Replicator: extend _lv_each_dependency() rep. deps
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (4 preceding siblings ...)
2010-03-17 13:46 ` [PATCH 05/25] Replicator: validate replicator segments Zdenek Kabelac
@ 2010-03-17 13:46 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 07/25] Replicator: extend VG with list of opened vgs Zdenek Kabelac
` (18 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:46 UTC (permalink / raw)
To: lvm-devel
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/metadata.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
index a3c855c..822e6d1 100644
--- a/lib/metadata/metadata.c
+++ b/lib/metadata/metadata.c
@@ -1977,6 +1977,8 @@ static int _lv_each_dependency(struct logical_volume *lv,
struct lv_segment *lvseg;
struct logical_volume *deps[] = {
+ (lv->rdevice && lv != lv->rdevice->lv) ? lv->rdevice->lv : 0,
+ (lv->rdevice && lv != lv->rdevice->slog) ? lv->rdevice->slog : 0,
lv->snapshot ? lv->snapshot->origin : 0,
lv->snapshot ? lv->snapshot->cow : 0 };
for (i = 0; i < sizeof(deps) / sizeof(*deps); ++i) {
@@ -1987,6 +1989,8 @@ static int _lv_each_dependency(struct logical_volume *lv,
dm_list_iterate_items(lvseg, &lv->segments) {
if (lvseg->log_lv && !fn(lvseg->log_lv, data))
return_0;
+ if (lvseg->rlog_lv && !fn(lvseg->rlog_lv, data))
+ return_0;
for (s = 0; s < lvseg->area_count; ++s) {
if (seg_type(lvseg, s) == AREA_LV && !fn(seg_lv(lvseg,s), data))
return_0;
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 07/25] Replicator: extend VG with list of opened vgs
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (5 preceding siblings ...)
2010-03-17 13:46 ` [PATCH 06/25] Replicator: extend _lv_each_dependency() rep. deps Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 08/25] Replicator: add sorted vg_name_list Zdenek Kabelac
` (17 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Add linked list of opened VGs and counter for missing VGs.
Needed for replicator target.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/metadata-exported.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index cc4221e..ac0681e 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -250,6 +250,10 @@ struct volume_group {
struct dm_list tags;
+ /* List of locked and opened VGs */
+ struct dm_list vgs;
+ uint32_t missing_vgs;
+
/*
* FIXME: Move the next fields into a different struct?
*/
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 08/25] Replicator: add sorted vg_name_list
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (6 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 07/25] Replicator: extend VG with list of opened vgs Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 09/25] Replicator: add lv_replicator_sites_check_vg Zdenek Kabelac
` (16 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Introduce struct vg_name_list to store information about needed
volume group name, vgid, flags and the pointer to opened VG.
Keep VG in list in alphabetical order for locking order.
Introduce functions vg_name_list_add(), vg_name_list_lookup(),
vg_name_list_splice(). They extend dm_list functionality.
vg_name_list_read() open list of VGs.
vg_name_list_release close VGs in reversed order.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/metadata-exported.h | 21 ++++++
lib/metadata/replicator_manip.c | 148 ++++++++++++++++++++++++++++++++++++++
2 files changed, 169 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index ac0681e..594c0b0 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -288,6 +288,15 @@ struct lv_segment_area {
struct segment_type;
+/* List with VG names */
+struct vg_name_list {
+ struct dm_list list;
+ const char *vg_name;
+ const char *vgid;
+ uint32_t flags;
+ struct volume_group *vg;
+};
+
/* ++ replicator datatypes */
typedef enum {
REPLICATOR_STATE_PASSIVE,
@@ -778,6 +787,18 @@ int lv_is_rlog(const struct logical_volume *lv);
int lv_is_slog(const struct logical_volume *lv);
struct logical_volume *first_replicator_dev(const struct logical_volume *lv);
/* -- metadata/replicator_manip.c */
+void vg_name_list_splice(struct dm_list *list, struct dm_list *head);
+struct vg_name_list *vg_name_list_add(struct dm_pool *mem,
+ struct dm_list *vg_nlist,
+ const char *vg_name, const char *vgid,
+ uint32_t flags);
+struct vg_name_list *vg_name_list_lookup(struct dm_list *vg_nlist,
+ const char *vg_name);
+
+int vg_name_list_read(struct cmd_context *cmd, struct dm_list *vgs_list,
+ struct vg_name_list *vnl_vg);
+void vg_name_list_release(struct dm_list *vgs_list,
+ struct vg_name_list *vnl_vg);
struct logical_volume *find_pvmove_lv(struct volume_group *vg,
struct device *dev, uint32_t lv_type);
diff --git a/lib/metadata/replicator_manip.c b/lib/metadata/replicator_manip.c
index 8ecb3a1..52a7fcb 100644
--- a/lib/metadata/replicator_manip.c
+++ b/lib/metadata/replicator_manip.c
@@ -338,3 +338,151 @@ struct logical_volume *first_replicator_dev(const struct logical_volume *lv)
return NULL;
}
+
+/**
+ * Join 'list' to 'head'
+ * CHECKME: introduce generic dm_list_splice()?
+ * syntax similar to linux kernel's list_splice()
+ */
+void vg_name_list_splice(struct dm_list *list, struct dm_list *head)
+{
+ struct dm_list *first = list->n;
+ struct dm_list *last = list->p;
+ struct dm_list *at = head->n;
+
+ struct vg_name_list *vnl;
+ dm_list_iterate_items(vnl, list)
+ log_debug("Before from list %s", vnl->vg_name);
+ dm_list_iterate_items(vnl, head)
+ log_debug("Before to head %s", vnl->vg_name);
+ first->p = head;
+ head->n = first;
+ last->n = at;
+ at->p = last;
+
+ dm_list_iterate_items(vnl, head)
+ log_debug("After head %s", vnl->vg_name);
+}
+
+/**
+ * Add to sorted list
+ *
+ * Maintain the alphabeticaly ordered list, avoid duplications
+ * return either newly created or already present vg_name_list entry
+ */
+struct vg_name_list *vg_name_list_add(struct dm_pool *mem,
+ struct dm_list *l,
+ const char *vg_name,
+ const char *vgid,
+ uint32_t flags)
+{
+ struct vg_name_list *vnl, *ins;
+
+ /* Is already in the list ? */
+ if ((vnl = vg_name_list_lookup(l, vg_name)))
+ return vnl;
+
+ if (!(vnl = dm_pool_alloc(mem, sizeof(*vnl)))) {
+ log_error("Allocation of vg_name_list failed.");
+ return NULL;
+ }
+
+ if (!(vnl->vg_name = dm_pool_strdup(mem, vg_name))) {
+ dm_pool_free(mem, vnl);
+ log_error("Allocation of vg_name failed.");
+ return NULL;
+ }
+
+ if (vgid &&
+ !(vnl->vgid = dm_pool_strdup(mem, vgid))) {
+ dm_pool_free(mem, vnl);
+ log_error("Allocation of vgid failed.");
+ return NULL;
+ } else
+ vnl->vgid = NULL;
+
+ vnl->flags = flags;
+ vnl->vg = NULL;
+ dm_list_iterate_items(ins, l)
+ if (strcmp(vg_name, ins->vg_name) < 0) {
+ l = &ins->list;
+ break;
+ }
+
+ dm_list_add(l, &vnl->list);
+
+ return vnl;
+}
+
+/**
+ * Find element with given vg_name in vg_name_list list
+ */
+struct vg_name_list *vg_name_list_lookup(struct dm_list *l, const char *vg_name)
+{
+ struct vg_name_list *vnl;
+
+ dm_list_iterate_items(vnl, l)
+ if (!strcmp(vg_name, vnl->vg_name))
+ return vnl;
+
+ return NULL;
+}
+
+/**
+ * Read and lock multiple VGs stored in vgs_list alphabeticaly
+ * \param vgs_list
+ * When vnl_vg is correctly opened vgs_list is spliced to vnl_vg->vg->vgs
+ * and left uninitialized and shall not be used until call of
+ * vg_name_list_release().
+ *
+ * \return
+ * Returns 1 if all VG in vgs_list are correctly openned and locked.
+ * Returns 0 if there is some problem with any VG.
+ *
+ * (Needed to allow support for FAILED_INCONSISTENT)
+ */
+int vg_name_list_read(struct cmd_context *cmd, struct dm_list *vgs_list,
+ struct vg_name_list *vnl_vg)
+{
+ struct vg_name_list *vnl;
+
+ /* Iterate through alphabeticaly ordered vg_name_list */
+ dm_list_iterate_items(vnl, vgs_list) {
+ vnl->vg = vg_read(cmd, vnl->vg_name, vnl->vgid, vnl->flags);
+ if (vg_read_error(vnl->vg)) {
+ log_debug("Failed to vg_read %s", vnl->vg_name);
+ return 0;
+ }
+ }
+
+ dm_list_init(&vnl_vg->vg->vgs);
+ vg_name_list_splice(vgs_list, &vnl_vg->vg->vgs);
+
+ return 1;
+}
+
+/**
+ * Release opened and locked VGs from vg_nlist
+ *
+ * \param vgs_list
+ * \param vnl_vg
+ * Contains VG with vg_name_list of active VGs, list is spliced to vgs_list
+ */
+void vg_name_list_release(struct dm_list *vgs_list,
+ struct vg_name_list *vnl_vg)
+{
+ struct vg_name_list *vnl;
+
+ if (vnl_vg->vg) {
+ dm_list_init(vgs_list);
+ vg_name_list_splice(&vnl_vg->vg->vgs, vgs_list);
+ }
+
+ dm_list_iterate_back_items(vnl, vgs_list) {
+ if (vg_read_error(vnl->vg))
+ vg_release(vnl->vg);
+ else
+ unlock_and_release_vg(vnl->vg->cmd, vnl->vg, vnl->vg_name);
+ vnl->vg = NULL;
+ }
+}
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 09/25] Replicator: add lv_replicator_sites_check_vg
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (7 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 08/25] Replicator: add sorted vg_name_list Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 10/25] Replicator: add read/release VG for rsites Zdenek Kabelac
` (15 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Adding lv_replicator_sites_check_vg() which is called before
taking lock_vol().
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/metadata-exported.h | 2 ++
lib/metadata/replicator_manip.c | 32 ++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 594c0b0..3e1da12 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -800,6 +800,8 @@ int vg_name_list_read(struct cmd_context *cmd, struct dm_list *vgs_list,
void vg_name_list_release(struct dm_list *vgs_list,
struct vg_name_list *vnl_vg);
+int lv_replicator_sites_check_vg(struct logical_volume *lv);
+
struct logical_volume *find_pvmove_lv(struct volume_group *vg,
struct device *dev, uint32_t lv_type);
struct logical_volume *find_pvmove_lv_from_pvname(struct cmd_context *cmd,
diff --git a/lib/metadata/replicator_manip.c b/lib/metadata/replicator_manip.c
index 52a7fcb..d5e3cda 100644
--- a/lib/metadata/replicator_manip.c
+++ b/lib/metadata/replicator_manip.c
@@ -486,3 +486,35 @@ void vg_name_list_release(struct dm_list *vgs_list,
vnl->vg = NULL;
}
}
+
+/**
+ * Check whether all VGs are available for processing given LV
+ * Missing VGs are added to the list
+ */
+int lv_replicator_sites_check_vg(struct logical_volume *lv)
+{
+ struct replicator_site *rsite;
+ int ret = 1;
+
+ if (!lv_is_replicator_dev(lv))
+ return 1;
+
+ dm_list_iterate_items(rsite, &first_seg(lv)->replicator->rsites) {
+ if (!rsite->vg_name ||
+ vg_name_list_lookup(&lv->vg->vgs, rsite->vg_name))
+ continue;
+ ret = 0;
+ /* Using cmd memory pool for list allocation */
+ if (!vg_name_list_add(lv->vg->cmd->mem, &lv->vg->vgs,
+ rsite->vg_name, NULL, 0)) {
+ stack;
+ lv->vg->missing_vgs = 0; /* do not retry */
+ break;
+ }
+
+ log_debug("VG: %s added as missing.", rsite->vg_name);
+ lv->vg->missing_vgs++;
+ }
+
+ return ret;
+}
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 10/25] Replicator: add read/release VG for rsites
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (8 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 09/25] Replicator: add lv_replicator_sites_check_vg Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 11/25] Replicator: use vg_name_list for _process_one_vg() Zdenek Kabelac
` (14 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Add function to read/release remote VGs from replicator sites
in activation context.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/metadata-exported.h | 2 +
lib/metadata/replicator_manip.c | 56 ++++++++++++++++++++++++++++++++++++++
2 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index 3e1da12..cf73bf8 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -801,6 +801,8 @@ void vg_name_list_release(struct dm_list *vgs_list,
struct vg_name_list *vnl_vg);
int lv_replicator_sites_check_vg(struct logical_volume *lv);
+int lv_replicator_sites_read(struct logical_volume *lv);
+void lv_replicator_sites_release(struct logical_volume *lv);
struct logical_volume *find_pvmove_lv(struct volume_group *vg,
struct device *dev, uint32_t lv_type);
diff --git a/lib/metadata/replicator_manip.c b/lib/metadata/replicator_manip.c
index d5e3cda..57e0346 100644
--- a/lib/metadata/replicator_manip.c
+++ b/lib/metadata/replicator_manip.c
@@ -518,3 +518,59 @@ int lv_replicator_sites_check_vg(struct logical_volume *lv)
return ret;
}
+
+/**
+ * Resolve all remote VGs from replicator sites
+ * This function is used in activation context and needs all VGs already locked
+ */
+int lv_replicator_sites_read(struct logical_volume *lv)
+{
+ struct replicator_device *rdev;
+ struct replicator_site *rsite;
+ struct volume_group *vg;
+
+ if (!lv_is_replicator_dev(lv))
+ return 1;
+
+ dm_list_iterate_items(rsite, &first_seg(lv)->replicator->rsites) {
+ if (!rsite->vg_name)
+ continue;
+ vg = vg_read(lv->vg->cmd, rsite->vg_name, 0, 0); // READ_WITHOUT_LOCK
+ if (vg_read_error(vg)) {
+ log_error("Unable to read volume group %s",
+ rsite->vg_name);
+ goto bad;
+ }
+ rsite->vg = vg;
+ /* CHECKME: handling missing LVs needs to be better */
+ dm_list_iterate_items(rdev, &rsite->rdevices)
+ if (!(rdev->lv = find_lv(vg, rdev->name))) {
+ log_error("Unable to find %s in volume group %s",
+ rdev->name, rsite->vg_name);
+ goto bad;
+ }
+ }
+
+ return 1;
+bad:
+ lv_replicator_sites_release(lv);
+ return 0;
+}
+
+/**
+ * Release all VG reources taken by replicator sites
+ * This function is used in activation context and needs all VGs already locked
+ */
+void lv_replicator_sites_release(struct logical_volume *lv)
+{
+ struct replicator_site *rsite;
+
+ if (!lv_is_replicator_dev(lv))
+ return;
+
+ dm_list_iterate_back_items(rsite, &first_seg(lv)->replicator->rsites)
+ if (rsite->vg_name && rsite->vg) {
+ vg_release(rsite->vg);
+ rsite->vg = NULL;
+ }
+}
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 11/25] Replicator: use vg_name_list for _process_one_vg()
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (9 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 10/25] Replicator: add read/release VG for rsites Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 12/25] Replicator: use str_list for process_each_lv_in_vg Zdenek Kabelac
` (13 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Patch modifes behavior of _process_one_vg().
In the first pass the plain vg_read() for the given VG is used.
Replicator collects sorted list of additional VGs during lock_vol.
If any needed VG is not yet opened the next iteration loop is taken
with collected VGs.
Flag vg->missing_vgs detects missing VGs.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
tools/toollib.c | 56 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 33 insertions(+), 23 deletions(-)
diff --git a/tools/toollib.c b/tools/toollib.c
index 972d077..066fbfd 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -424,37 +424,47 @@ static int _process_one_vg(struct cmd_context *cmd, const char *vg_name,
struct volume_group * vg,
void *handle))
{
- struct volume_group *vg;
+ struct dm_list vgs_list;
+ struct vg_name_list *vnl_vg;
int ret = 0;
log_verbose("Finding volume group \"%s\"", vg_name);
- vg = vg_read(cmd, vg_name, vgid, flags);
- /* Allow FAILED_INCONSISTENT through only for vgcfgrestore */
- if (vg_read_error(vg) &&
- !((vg_read_error(vg) == FAILED_INCONSISTENT) &&
- (flags & READ_ALLOW_INCONSISTENT))) {
- ret_max = ECMD_FAILED;
- goto_out;
- }
+ dm_list_init(&vgs_list);
+ vnl_vg = vg_name_list_add(cmd->mem, &vgs_list, vg_name, vgid, flags);
+ if (!vnl_vg)
+ return_0;
+
+ while (!sigint_caught()) {
+ if (!vg_name_list_read(cmd, &vgs_list, vnl_vg))
+ /* Allow FAILED_INCONSISTENT through only for vgcfgrestore */
+ if (vg_read_error(vnl_vg->vg) &&
+ (!((flags & READ_ALLOW_INCONSISTENT) &&
+ (vg_read_error(vnl_vg->vg) == FAILED_INCONSISTENT)))) {
+ ret = ECMD_FAILED;
+ break;
+ }
+
+ if (!dm_list_empty(tags) &&
+ /* Only process if a tag matches or it's on arg_vgnames */
+ !str_list_match_item(arg_vgnames, vg_name) &&
+ !str_list_match_list(tags, &vnl_vg->vg->tags))
+ break;
- if (!dm_list_empty(tags)) {
- /* Only process if a tag matches or it's on arg_vgnames */
- if (!str_list_match_item(arg_vgnames, vg_name) &&
- !str_list_match_list(tags, &vg->tags))
- goto out;
+ ret = process_single(cmd, vg_name, vnl_vg->vg, handle);
+
+ if (vg_read_error(vnl_vg->vg)) /* FAILED_INCONSISTENT */
+ break;
+
+ if (!vnl_vg->vg->missing_vgs)
+ break;
+
+ vg_name_list_release(&vgs_list, vnl_vg);
}
- if ((ret = process_single(cmd, vg_name, vg,
- handle)) > ret_max)
- ret_max = ret;
+ vg_name_list_release(&vgs_list, vnl_vg);
-out:
- if (vg_read_error(vg))
- vg_release(vg);
- else
- unlock_and_release_vg(cmd, vg, vg_name);
- return ret_max;
+ return (ret > ret_max) ? ret : ret_max;
}
int process_each_vg(struct cmd_context *cmd, int argc, char **argv,
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 12/25] Replicator: use str_list for process_each_lv_in_vg
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (10 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 11/25] Replicator: use vg_name_list for _process_one_vg() Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 13/25] Replicator: lock_vol update replicator LV Zdenek Kabelac
` (12 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
As for _process_one_vg() we need similar retry loop for
process_each_lv_in_vg(). This patch tries to collect missed LVs and
then reopens collected VGs and process only selected LVs again.
Patch does not add any extra repeated invocations if there is not
missing VG during LV processing.
cmd_context is extended to avoid API change with vgs_lvs_retry list.
FIXME: modify process_each_lv_in_vg() API to avoid this change
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/commands/toolcontext.c | 1 +
lib/commands/toolcontext.h | 2 +
tools/toollib.c | 61 ++++++++++++++++++++++++++++++++++++-------
3 files changed, 54 insertions(+), 10 deletions(-)
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c
index 118f09c..b61f37a 100644
--- a/lib/commands/toolcontext.c
+++ b/lib/commands/toolcontext.c
@@ -1109,6 +1109,7 @@ struct cmd_context *create_toolcontext(unsigned is_long_lived,
dm_list_init(&cmd->segtypes);
dm_list_init(&cmd->tags);
dm_list_init(&cmd->config_files);
+ dm_list_init(&cmd->vgs_lvs_retry);
/* FIXME Make this configurable? */
reset_lvm_errno(1);
diff --git a/lib/commands/toolcontext.h b/lib/commands/toolcontext.h
index eac5721..a72d76d 100644
--- a/lib/commands/toolcontext.h
+++ b/lib/commands/toolcontext.h
@@ -96,6 +96,8 @@ struct cmd_context {
char dev_dir[PATH_MAX];
char proc_dir[PATH_MAX];
char sysfs_dir[PATH_MAX];
+
+ struct dm_list vgs_lvs_retry; /* Retry LVs with more VGs */
};
/*
diff --git a/tools/toollib.c b/tools/toollib.c
index 066fbfd..1cff219 100644
--- a/tools/toollib.c
+++ b/tools/toollib.c
@@ -118,6 +118,7 @@ int process_each_lv_in_vg(struct cmd_context *cmd,
process_all = 1;
}
+ dm_list_init(&cmd->vgs_lvs_retry);
dm_list_iterate_items(lvl, &vg->lvs) {
if (lvl->lv->status & SNAPSHOT)
continue;
@@ -147,7 +148,17 @@ int process_each_lv_in_vg(struct cmd_context *cmd,
if (!process_lv)
continue;
+ lvl->lv->vg->missing_vgs = 0;
ret = process_single(cmd, lvl->lv, handle);
+ if (lvl->lv->vg->missing_vgs) {
+ if (!str_list_add(cmd->mem, &cmd->vgs_lvs_retry,
+ dm_pool_strdup(cmd->mem,
+ lvl->lv->name))) {
+ log_error("Allocation failed for str_list.");
+ return ECMD_FAILED;
+ }
+ ret = 0;
+ }
if (ret > ret_max)
ret_max = ret;
if (sigint_caught())
@@ -175,8 +186,9 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
struct dm_list *tags_arg;
struct dm_list *vgnames; /* VGs to process */
- struct str_list *sll, *strl;
- struct volume_group *vg;
+ struct str_list *sll, *strl, *sllt;
+ struct vg_name_list *vnl_vg;
+ struct dm_list vgs_list;
struct dm_list tags, lvnames;
struct dm_list arg_lvnames; /* Cmdline vgname or vgname/lvname */
char *vglv;
@@ -281,13 +293,17 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
}
}
- vg = NULL;
dm_list_iterate_items(strl, vgnames) {
vgname = strl->str;
- vg = vg_read(cmd, vgname, NULL, flags);
+ dm_list_init(&vgs_list);
+ if (!(vnl_vg = vg_name_list_add(cmd->mem, &vgs_list,
+ vgname, NULL, flags))) {
+ stack;
+ return ECMD_FAILED;
+ }
- if (vg_read_error(vg)) {
- vg_release(vg);
+ if (!vg_name_list_read(cmd, &vgs_list, vnl_vg)) {
+ vg_name_list_release(&vgs_list,vnl_vg);
if (ret_max < ECMD_FAILED) {
log_error("Skipping volume group %s", vgname);
ret_max = ECMD_FAILED;
@@ -313,17 +329,42 @@ int process_each_lv(struct cmd_context *cmd, int argc, char **argv,
dm_pool_strdup(cmd->mem,
lv_name + 1))) {
log_error("strlist allocation failed");
- unlock_and_release_vg(cmd, vg, vgname);
+ vg_name_list_release(&vgs_list,vnl_vg);
return ECMD_FAILED;
}
}
}
- ret = process_each_lv_in_vg(cmd, vg, &lvnames, tags_arg,
- handle, process_single);
- unlock_and_release_vg(cmd, vg, vgname);
+ ret = process_each_lv_in_vg(cmd, vnl_vg->vg, &lvnames,
+ tags_arg, handle, process_single);
if (ret > ret_max)
ret_max = ret;
+
+ while (vnl_vg->vg && vnl_vg->vg->missing_vgs &&
+ !sigint_caught() &&
+ !dm_list_empty(&cmd->vgs_lvs_retry)) {
+ /*
+ * Try again with missed LVs in this VG
+ * Move retry list to list of processed LVs
+ */
+ dm_list_init(&lvnames);
+ dm_list_iterate_items_safe(sll, sllt,
+ &cmd->vgs_lvs_retry)
+ dm_list_move(&lvnames, &sll->list);
+
+ vg_name_list_release(&vgs_list, vnl_vg);
+ if (!vg_name_list_read(cmd, &vgs_list, vnl_vg))
+ ret = ECMD_FAILED; /* empty retry list breaks loop */
+ else
+ ret = process_each_lv_in_vg(cmd, vnl_vg->vg,
+ &lvnames,
+ tags_arg, handle,
+ process_single);
+ if (ret > ret_max)
+ ret_max = ret;
+ }
+
+ vg_name_list_release(&vgs_list, vnl_vg);
if (sigint_caught())
break;
}
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 13/25] Replicator: lock_vol update replicator LV
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (11 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 12/25] Replicator: use str_list for process_each_lv_in_vg Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 14:28 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 14/25] Replicator: extend activate with rsite resolving Zdenek Kabelac
` (11 subsequent siblings)
24 siblings, 1 reply; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Add LCK_MISSING_VG flag to sinal missing VG to _lock_vol function.
This way we easily detect whether we still need to lock more VGs
while having all data available - it would be ackware to resolve it
from resource uuid string. In the case missing VG is found,
whole whole operation must be retried - this usually requires to
release all locks, and take them again in the alphabetic order.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/locking/locking.c | 3 +++
lib/locking/locking.h | 7 ++++++-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/lib/locking/locking.c b/lib/locking/locking.c
index 76dbda5..57b7ba9 100644
--- a/lib/locking/locking.c
+++ b/lib/locking/locking.c
@@ -362,6 +362,9 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource,
{
int ret = 0;
+ if (flags & LCK_MISSING_VG)
+ return_0;
+
_block_signals(flags);
_lock_memory(cmd, lv_op);
diff --git a/lib/locking/locking.h b/lib/locking/locking.h
index e7f25b9..da442ec 100644
--- a/lib/locking/locking.h
+++ b/lib/locking/locking.h
@@ -86,6 +86,7 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);
#define LCK_LOCAL 0x00000040U /* Don't propagate to other nodes */
#define LCK_CLUSTER_VG 0x00000080U /* VG is clustered */
#define LCK_CACHE 0x00000100U /* Operation on cache only using P_ lock */
+#define LCK_MISSING_VG 0x00000200U /* 'Remote' VG misses lock for this LV */
/*
* Additional lock bits for cluster communication
@@ -128,8 +129,12 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);
#define LCK_LV_CLUSTERED(lv) \
(vg_is_clustered((lv)->vg) ? LCK_CLUSTER_VG : 0)
+#define LCK_CHECK_MISSING_VG(lv) \
+ (lv_replicator_sites_check_vg((lv)) ? 0 : LCK_MISSING_VG)
+
#define lock_lv_vol(cmd, lv, flags) \
- lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv))
+ lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv) | \
+ LCK_CHECK_MISSING_VG(lv))
#define unlock_vg(cmd, vol) lock_vol(cmd, vol, LCK_VG_UNLOCK)
#define unlock_and_release_vg(cmd, vg, vol) \
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 13/25] Replicator: lock_vol update replicator LV
2010-03-17 13:47 ` [PATCH 13/25] Replicator: lock_vol update replicator LV Zdenek Kabelac
@ 2010-03-17 14:28 ` Zdenek Kabelac
0 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 14:28 UTC (permalink / raw)
To: lvm-devel
On 17.3.2010 14:47, Zdenek Kabelac wrote:
> Add LCK_MISSING_VG flag to sinal missing VG to _lock_vol function.
> This way we easily detect whether we still need to lock more VGs
> while having all data available - it would be ackware to resolve it
> from resource uuid string. In the case missing VG is found,
> whole whole operation must be retried - this usually requires to
> release all locks, and take them again in the alphabetic order.
>
> Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
> ---
> lib/locking/locking.c | 3 +++
> lib/locking/locking.h | 7 ++++++-
> 2 files changed, 9 insertions(+), 1 deletions(-)
>
> diff --git a/lib/locking/locking.c b/lib/locking/locking.c
> index 76dbda5..57b7ba9 100644
> --- a/lib/locking/locking.c
> +++ b/lib/locking/locking.c
> @@ -362,6 +362,9 @@ static int _lock_vol(struct cmd_context *cmd, const char *resource,
> {
> int ret = 0;
>
> + if (flags & LCK_MISSING_VG)
> + return_0;
> +
> _block_signals(flags);
> _lock_memory(cmd, lv_op);
>
> diff --git a/lib/locking/locking.h b/lib/locking/locking.h
> index e7f25b9..da442ec 100644
> --- a/lib/locking/locking.h
> +++ b/lib/locking/locking.h
> @@ -86,6 +86,7 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);
> #define LCK_LOCAL 0x00000040U /* Don't propagate to other nodes */
> #define LCK_CLUSTER_VG 0x00000080U /* VG is clustered */
> #define LCK_CACHE 0x00000100U /* Operation on cache only using P_ lock */
> +#define LCK_MISSING_VG 0x00000200U /* 'Remote' VG misses lock for this LV */
>
> /*
> * Additional lock bits for cluster communication
> @@ -128,8 +129,12 @@ int check_lvm1_vg_inactive(struct cmd_context *cmd, const char *vgname);
> #define LCK_LV_CLUSTERED(lv) \
> (vg_is_clustered((lv)->vg) ? LCK_CLUSTER_VG : 0)
>
> +#define LCK_CHECK_MISSING_VG(lv) \
> + (lv_replicator_sites_check_vg((lv)) ? 0 : LCK_MISSING_VG)
> +
> #define lock_lv_vol(cmd, lv, flags) \
> - lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv))
> + lock_vol(cmd, (lv)->lvid.s, flags | LCK_LV_CLUSTERED(lv) | \
> + LCK_CHECK_MISSING_VG(lv))
>
> #define unlock_vg(cmd, vol) lock_vol(cmd, vol, LCK_VG_UNLOCK)
> #define unlock_and_release_vg(cmd, vg, vol) \
Here is simpler version which doesn't change LCK flags - so no changes in
clmvd....
Zdenek
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0018-Replicator-lock_vol-update-replicator-LV.patch
Type: text/x-patch
Size: 1041 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/lvm-devel/attachments/20100317/3a4accce/attachment.bin>
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH 14/25] Replicator: extend activate with rsite resolving
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (12 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 13/25] Replicator: lock_vol update replicator LV Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 15/25] Replicator: update _create_partial_dtree() Zdenek Kabelac
` (10 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Activation code needs to have all remote lv pointers resolved.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/activate/activate.c | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/lib/activate/activate.c b/lib/activate/activate.c
index eb94ac0..6c28c4f 100644
--- a/lib/activate/activate.c
+++ b/lib/activate/activate.c
@@ -854,6 +854,9 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
goto out;
}
+ if (!lv_replicator_sites_read(lv))
+ goto_out;
+
lv_calculate_readahead(lv, NULL);
/* If VG was precommitted, preload devices for the LV */
@@ -883,9 +886,10 @@ static int _lv_suspend(struct cmd_context *cmd, const char *lvid_s,
out:
if (lv_pre)
vg_release(lv_pre->vg);
- if (lv)
+ if (lv) {
+ lv_replicator_sites_release(lv);
vg_release(lv->vg);
-
+ }
return r;
}
@@ -1014,6 +1018,9 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s)
goto_out;
}
+ if (!lv_replicator_sites_read(lv))
+ goto_out;
+
lv_calculate_readahead(lv, NULL);
if (!monitor_dev_for_events(cmd, lv, 0))
@@ -1027,8 +1034,10 @@ int lv_deactivate(struct cmd_context *cmd, const char *lvid_s)
if (!lv_info(cmd, lv, &info, 1, 0) || info.exists)
r = 0;
out:
- if (lv)
+ if (lv) {
+ lv_replicator_sites_release(lv);
vg_release(lv->vg);
+ }
return r;
}
@@ -1107,6 +1116,9 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
goto out;
}
+ if (!lv_replicator_sites_read(lv))
+ goto_out;
+
lv_calculate_readahead(lv, NULL);
if (exclusive)
@@ -1122,8 +1134,10 @@ static int _lv_activate(struct cmd_context *cmd, const char *lvid_s,
stack;
out:
- if (lv)
+ if (lv) {
+ lv_replicator_sites_release(lv);
vg_release(lv->vg);
+ }
return r;
}
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 15/25] Replicator: update _create_partial_dtree()
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (13 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 14/25] Replicator: extend activate with rsite resolving Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 16/25] Replicator: vg with missing_vgs does not print Zdenek Kabelac
` (9 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Adding function _create_partial_replicator() to create
partial tree for Replicator target.
Using dm_tree_set_suspend_priority() for Replicator.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/activate/dev_manager.c | 75 ++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 75 insertions(+), 0 deletions(-)
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 5c5bc44..1adefc8 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -867,6 +867,75 @@ static int _add_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree, struc
return 1;
}
+/*
+ * Add devices from replicator
+ * use _add_dev_to_dtree() directly instead of _add_lv_to_dtree()
+ * no need to extend its check with _slog, _rlog, _rimage
+ */
+static int _create_partial_replicator(struct dev_manager *dm,
+ struct dm_tree *dtree,
+ struct lv_segment *seg)
+{
+ struct replicator_device *rdev;
+ struct replicator_site *rsite;
+ const char *replicator_dlid;
+
+ if (!lv_is_active_replicator_dev(seg->lv)) {
+ if (!_add_dev_to_dtree(dm, dtree, seg->lv->rdevice->lv,
+ NULL))
+ return_0;
+ return 1;
+ }
+
+ /* Add all related devs for replicator */
+ dm_list_iterate_items(rsite, &seg->replicator->rsites) {
+ dm_list_iterate_items(rdev, &rsite->rdevices) {
+ if (rsite->state == REPLICATOR_STATE_ACTIVE) {
+ /* Add _rimage LV */
+ if (rdev->lv &&
+ !_add_dev_to_dtree(dm, dtree,
+ rdev->lv, NULL))
+ return_0;
+
+ /* Add replicator-dev LV */
+ if (seg->lv != rdev->replicator_dev->lv &&
+ !_add_dev_to_dtree(dm, dtree,
+ rdev->replicator_dev->lv,
+ NULL))
+ return_0;
+ }
+
+ if (!rdev->rsite->vg_name)
+ continue;
+
+ if (rdev->lv &&
+ !_add_dev_to_dtree(dm, dtree, rdev->lv, NULL))
+ return_0;
+
+ if (rdev->slog &&
+ !_add_dev_to_dtree(dm, dtree, rdev->slog, NULL))
+ return_0;
+
+ }
+ }
+
+ /* Add rlog and replicator devices */
+ if (first_seg(seg->replicator)->rlog_lv &&
+ !_add_dev_to_dtree(dm, dtree,
+ first_seg(seg->replicator)->rlog_lv, NULL))
+ return_0;
+ if (!_add_dev_to_dtree(dm, dtree, seg->replicator, NULL))
+ return_0;
+
+ /* Set suspend priority for replicator device */
+ if (!(replicator_dlid = build_dlid(dm, seg->replicator->lvid.s, NULL)))
+ return_0;
+ if (!dm_tree_set_suspend_priority(dtree, replicator_dlid, 1))
+ return_0;
+
+ return 1;
+}
+
static struct dm_tree *_create_partial_dtree(struct dev_manager *dm, struct logical_volume *lv)
{
struct dm_tree *dtree;
@@ -887,6 +956,12 @@ static struct dm_tree *_create_partial_dtree(struct dev_manager *dm, struct logi
if (!_add_lv_to_dtree(dm, dtree, dm_list_struct_base(snh, struct lv_segment, origin_list)->cow))
goto_bad;
+ /* Add any replicator-dev LVs of this LV */
+ dm_list_iterate_items(seg, &lv->segments)
+ if (seg_is_replicator_dev(seg) &&
+ !_create_partial_replicator(dm, dtree, seg))
+ goto_bad;
+
/* Add any LVs used by segments in this LV */
dm_list_iterate_items(seg, &lv->segments)
for (s = 0; s < seg->area_count; s++)
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 16/25] Replicator: vg with missing_vgs does not print
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (14 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 15/25] Replicator: update _create_partial_dtree() Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 17/25] Replicator: add replicator to dtree Zdenek Kabelac
` (8 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
If missed VGs do not print message and wait for retry.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
tools/vgchange.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 6d869f9..4045411 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -224,8 +224,9 @@ static int _vgchange_available(struct cmd_context *cmd, struct volume_group *vg)
ret = _activate_lvs_in_vg(cmd, vg, available);
- log_print("%d logical volume(s) in volume group \"%s\" now active",
- lvs_in_vg_activated(vg), vg->name);
+ if (!vg->missing_vgs)
+ log_print("%d logical volume(s) in volume group \"%s\" now active",
+ lvs_in_vg_activated(vg), vg->name);
return ret;
}
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 17/25] Replicator: add replicator to dtree
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (15 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 16/25] Replicator: vg with missing_vgs does not print Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 18/25] Replicator: do not remove of replicators' LVs Zdenek Kabelac
` (7 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Adding all replicator related LVs to dtree.
Start of one replicator_dev initiate start of all other related.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/activate/dev_manager.c | 60 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 59 insertions(+), 1 deletions(-)
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 1adefc8..451ba2b 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1173,6 +1173,61 @@ static int _add_target_to_dtree(struct dev_manager *dm,
static int _add_new_lv_to_dtree(struct dev_manager *dm, struct dm_tree *dtree,
struct logical_volume *lv, const char *layer);
+/* Add all replicators' LVs from active segment */
+static int _add_replicator_dev_target_to_dtree(struct dev_manager *dm,
+ struct dm_tree *dtree,
+ struct lv_segment *seg)
+{
+ struct replicator_device *rdev;
+ struct replicator_site *rsite;
+
+ /* Only active replicator */
+ if (!lv_is_active_replicator_dev(seg->lv)) {
+ if (!_add_new_lv_to_dtree(dm, dtree, seg->lv->rdevice->lv, NULL))
+ return_0;
+ return 1;
+ }
+
+ /* Add rlog and replicator nodes */
+ if (!seg->replicator ||
+ !first_seg(seg->replicator)->rlog_lv ||
+ !_add_new_lv_to_dtree(dm, dtree,
+ first_seg(seg->replicator)->rlog_lv, NULL) ||
+ !_add_new_lv_to_dtree(dm, dtree, seg->replicator, NULL))
+ return_0;
+
+ /* Activation of one replicator_dev node activates all other nodes */
+ dm_list_iterate_items(rsite, &seg->replicator->rsites) {
+ dm_list_iterate_items(rdev, &rsite->rdevices) {
+ if (rdev->lv &&
+ !_add_new_lv_to_dtree(dm, dtree, rdev->lv, NULL))
+ return_0;
+
+ if (rdev->slog &&
+ !_add_new_lv_to_dtree(dm, dtree,
+ rdev->slog, NULL))
+ return_0;
+ }
+ }
+ /* Add remaining replicator-dev nodes in the second loop
+ * to avoid multiple retries for inserting all elements */
+ dm_list_iterate_items(rsite, &seg->replicator->rsites) {
+ if (rsite->state != REPLICATOR_STATE_ACTIVE)
+ continue;
+ dm_list_iterate_items(rdev, &rsite->rdevices) {
+ if (rdev->replicator_dev->lv == seg->lv)
+ continue;
+ if (!rdev->replicator_dev->lv ||
+ !_add_new_lv_to_dtree(dm, dtree,
+ rdev->replicator_dev->lv,
+ NULL))
+ return_0;
+ }
+ }
+
+ return 1;
+}
+
static int _add_segment_to_dtree(struct dev_manager *dm,
struct dm_tree *dtree,
struct dm_tree_node *dnode,
@@ -1203,9 +1258,12 @@ static int _add_segment_to_dtree(struct dev_manager *dm,
!_add_new_lv_to_dtree(dm, dtree, seg->log_lv, NULL))
return_0;
+ if (seg_is_replicator_dev(seg)) {
+ if (!_add_replicator_dev_target_to_dtree(dm, dtree, seg))
+ return_0;
/* If this is a snapshot origin, add real LV */
/* If this is a snapshot origin + merging snapshot, add cow + real LV */
- if (lv_is_origin(seg->lv) && !layer) {
+ } else if (lv_is_origin(seg->lv) && !layer) {
if (vg_is_clustered(seg->lv->vg)) {
log_error("Clustered snapshots are not yet supported");
return 0;
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 18/25] Replicator: do not remove of replicators' LVs
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (16 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 17/25] Replicator: add replicator to dtree Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 19/25] Replicator: no crash lvresize if area_count is 0 Zdenek Kabelac
` (6 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/lv_manip.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index abcbcbf..766e6a0 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -2080,6 +2080,15 @@ int lv_remove_single(struct cmd_context *cmd, struct logical_volume *lv,
return 0;
}
+ if (lv_is_replicator_dev(lv) ||
+ lv_is_rimage(lv) ||
+ lv_is_rlog(lv) ||
+ lv_is_slog(lv)) {
+ log_error("Can't remove logical volume %s used by a "
+ "replicator.", lv->name);
+ return 0;
+ }
+
if (lv->status & LOCKED) {
log_error("Can't remove locked LV %s", lv->name);
return 0;
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 19/25] Replicator: no crash lvresize if area_count is 0
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (17 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 18/25] Replicator: do not remove of replicators' LVs Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-18 13:44 ` Alasdair G Kergon
2010-03-17 13:47 ` [PATCH 20/25] Replicator: activate change for vgchange Zdenek Kabelac
` (5 subsequent siblings)
24 siblings, 1 reply; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Currently with replicator-dev LV we get area_count=0 for lvresize request.
The original reason needs to be exploread, meanwhile avoid crash,
but stopping processing if count is 0.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/metadata/lv_manip.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index 766e6a0..67cd220 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -1380,6 +1380,11 @@ int lv_add_segment(struct alloc_handle *ah,
return 0;
}
+ if (!ah->area_count) {
+ log_error("Allocated areas are empty.");
+ return 0;
+ }
+
if (!_setup_alloced_segments(lv, &ah->alloced_areas[first_area],
num_areas, status,
stripe_size, segtype,
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 20/25] Replicator: activate change for vgchange
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (18 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 19/25] Replicator: no crash lvresize if area_count is 0 Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 21/25] Replicator: add new options for replicator Zdenek Kabelac
` (4 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Activate only the first replicator-dev LV, that activates all other
related LVs from Replicator.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
tools/vgchange.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/tools/vgchange.c b/tools/vgchange.c
index 4045411..637ce78 100644
--- a/tools/vgchange.c
+++ b/tools/vgchange.c
@@ -104,6 +104,10 @@ static int _activate_lvs_in_vg(struct cmd_context *cmd,
if ((lv->status & MIRROR_IMAGE) || (lv->status & MIRROR_LOG))
continue;
+ /* Only request activation of the first replicator-dev LV */
+ if (lv_is_replicator_dev(lv) && (lv != first_replicator_dev(lv)))
+ continue;
+
/* Can't deactivate a pvmove LV */
/* FIXME There needs to be a controlled way of doing this */
if (((activate == CHANGE_AN) || (activate == CHANGE_ALN)) &&
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 21/25] Replicator: add new options for replicator
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (19 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 20/25] Replicator: activate change for vgchange Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 22/25] Replicator: man pages for lvcreate, lvchange Zdenek Kabelac
` (3 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
New options: addsite, delsite, replicator,
replicatorlog, replicatorlogtype.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/config/defaults.h | 1 +
lib/metadata/metadata-exported.h | 1 +
tools/args.h | 13 ++++++++
tools/commands.h | 10 +++++-
tools/lvcreate.c | 58 +++++++++++++++++++++++++++++++++++++-
tools/lvmcmdline.c | 9 ++++++
tools/tools.h | 1 +
7 files changed, 90 insertions(+), 3 deletions(-)
diff --git a/lib/config/defaults.h b/lib/config/defaults.h
index 22a085d..4ef94ff 100644
--- a/lib/config/defaults.h
+++ b/lib/config/defaults.h
@@ -108,6 +108,7 @@
#define DEFAULT_STRIPE_FILLER "error"
#define DEFAULT_MIRROR_REGION_SIZE 512 /* KB */
+#define DEFAULT_REPLICATOR_REGION_SIZE 512 /* KB */
#define DEFAULT_INTERVAL 15
#ifdef READLINE_SUPPORT
diff --git a/lib/metadata/metadata-exported.h b/lib/metadata/metadata-exported.h
index cf73bf8..3c49b7b 100644
--- a/lib/metadata/metadata-exported.h
+++ b/lib/metadata/metadata-exported.h
@@ -596,6 +596,7 @@ uint64_t extents_from_size(struct cmd_context *cmd, uint64_t size,
struct lvcreate_params {
/* flags */
int snapshot; /* snap */
+ int replicator; /* replicator */
int zero; /* all */
int major; /* all */
int minor; /* all */
diff --git a/tools/args.h b/tools/args.h
index 981f45f..4623ff6 100644
--- a/tools/args.h
+++ b/tools/args.h
@@ -66,6 +66,19 @@ arg(virtualoriginsize_ARG, '\0', "virtualoriginsize", size_mb_arg, 0)
arg(virtualsize_ARG, '\0', "virtualsize", size_mb_arg, 0)
arg(noudevsync_ARG, '\0', "noudevsync", NULL, 0)
arg(poll_ARG, '\0', "poll", yes_no_arg, 0)
+arg(replicator_ARG, '\0', "replicator", NULL, 0)
+arg(replicatordev_ARG, '\0', "replicatordev", NULL, 0)
+arg(replicatorlog_ARG, '\0', "replicatorlog", NULL, 0)
+arg(replicatorlogtype_ARG, '\0', "replicatorlogtype", NULL, 0)
+arg(addsite_ARG, '\0', "addsite", site_arg, 0)
+arg(delsite_ARG, '\0', "delsite", site_arg, 0)
+arg(fallbehinddata_ARG, '\0', "fallbehinddata", size_mb_arg, 0)
+arg(fallbehindios_ARG, '\0', "fallbehindios", int_arg, 0)
+arg(fallbehindtimeout_ARG, '\0', "fallbehindtimeout", int_arg, 0)
+arg(sitemode_ARG, '\0', "sitemode", string_arg, 0)
+arg(activesite_ARG, '\0', "activesite", string_arg, 0)
+arg(passivesite_ARG, '\0', "passivesite", string_arg, 0)
+arg(remotevolumegroup_ARG, '\0', "remotevolumegroup", string_arg, 0)
/* Allow some variations */
arg(resizable_ARG, '\0', "resizable", yes_no_arg, 0)
diff --git a/tools/commands.h b/tools/commands.h
index ad0b385..44c5a21 100644
--- a/tools/commands.h
+++ b/tools/commands.h
@@ -62,10 +62,12 @@ xx(lvchange,
"lvchange\n"
"\t[-A|--autobackup y|n]\n"
"\t[-a|--available [e|l]y|n]\n"
+ "\t[--addsite Site]\n"
"\t[--addtag Tag]\n"
"\t[--alloc AllocationPolicy]\n"
"\t[-C|--contiguous y|n]\n"
"\t[-d|--debug]\n"
+ "\t[--delsite Site]\n"
"\t[--deltag Tag]\n"
"\t[-f|--force]\n"
"\t[-h|--help]\n"
@@ -90,7 +92,7 @@ xx(lvchange,
ignorelockingfailure_ARG, ignoremonitoring_ARG, major_ARG, minor_ARG,
monitor_ARG, noudevsync_ARG, partial_ARG, permission_ARG, persistent_ARG,
poll_ARG, readahead_ARG, resync_ARG, refresh_ARG, addtag_ARG, deltag_ARG,
- test_ARG, yes_ARG)
+ test_ARG, addsite_ARG, delsite_ARG, yes_ARG)
xx(lvconvert,
"Change logical volume layout",
@@ -160,6 +162,9 @@ xx(lvcreate,
"\t[-p|--permission {r|rw}]\n"
"\t[-r|--readahead ReadAheadSectors|auto|none]\n"
"\t[-R|--regionsize MirrorLogRegionSize]\n"
+ "\t[--replicator]\n"
+ "\t[--replicatorlog LogicalVolumeName]\n"
+ "\t[--replicatorlogtype ringbuffer]\n"
"\t[-t|--test]\n"
"\t[--type VolumeType]\n"
"\t[-v|--verbose]\n"
@@ -194,7 +199,8 @@ xx(lvcreate,
addtag_ARG, alloc_ARG, autobackup_ARG, chunksize_ARG, contiguous_ARG,
corelog_ARG, extents_ARG, major_ARG, minor_ARG, mirrorlog_ARG, mirrors_ARG,
name_ARG, nosync_ARG, noudevsync_ARG, permission_ARG, persistent_ARG,
- readahead_ARG, regionsize_ARG, size_ARG, snapshot_ARG, stripes_ARG,
+ readahead_ARG, regionsize_ARG, replicator_ARG, replicatorlog_ARG,
+ replicatorlogtype_ARG, size_ARG, snapshot_ARG, stripes_ARG,
stripesize_ARG, test_ARG, type_ARG, virtualoriginsize_ARG, virtualsize_ARG,
zero_ARG)
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 211cfeb..45a1c72 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -379,6 +379,36 @@ static int _read_mirror_params(struct lvcreate_params *lp,
return 1;
}
+static int _read_replicator_params(struct lvcreate_params *lp,
+ struct cmd_context *cmd)
+{
+ int region_size;
+ const char *mirrorlog;
+
+ if (arg_count(cmd, regionsize_ARG)) {
+ if (arg_sign_value(cmd, regionsize_ARG, 0) == SIGN_MINUS) {
+ log_error("Negative regionsize is invalid.");
+ return 0;
+ }
+ lp->region_size = arg_uint_value(cmd, regionsize_ARG, 0);
+ } else {
+ region_size = 2 * find_config_tree_int(cmd,
+ "activation/replicator_region_size",
+ DEFAULT_REPLICATOR_REGION_SIZE);
+ if (region_size < 0) {
+ log_error("Negative replicator_region_size in configuration "
+ "file is invalid.");
+ return 0;
+ }
+ lp->region_size = region_size;
+ }
+
+ if (!_validate_mirror_params(cmd, lp)) /* reuse ? */
+ return 0;
+
+ return 1;
+}
+
static int _lvcreate_params(struct lvcreate_params *lp,
struct lvcreate_cmdline_params *lcp,
struct cmd_context *cmd,
@@ -386,6 +416,7 @@ static int _lvcreate_params(struct lvcreate_params *lp,
{
int contiguous;
unsigned pagesize;
+ int i;
memset(lp, 0, sizeof(*lp));
memset(lcp, 0, sizeof(*lcp));
@@ -411,6 +442,9 @@ static int _lvcreate_params(struct lvcreate_params *lp,
if (seg_is_mirrored(lp))
lp->mirrors = 2;
+ if (seg_is_replicator(lp) || arg_count(cmd, replicator_ARG))
+ lp->replicator = 1;
+
if (arg_count(cmd, mirrors_ARG)) {
lp->mirrors = arg_uint_value(cmd, mirrors_ARG, 0) + 1;
if (lp->mirrors == 1)
@@ -475,6 +509,27 @@ static int _lvcreate_params(struct lvcreate_params *lp,
}
}
+ if (lp->replicator) {
+ log_error("--replicator for replicators");
+
+ } else {
+ static const struct {
+ const char *str;
+ int argname;
+ } repargs[] = {
+ { "replicatorlog", replicatorlog_ARG },
+ { "replicatorlog", replicatorlog_ARG },
+ { "remotevolumegroup", remotevolumegroup_ARG }
+ };
+
+ for (i = 0; i < sizeof(repargs)/sizeof(repargs[0]); ++i)
+ if (arg_count(cmd, repargs[i].argname)) {
+ log_error("--%s is only available "
+ "with replicators.", repargs[i].str);
+ return 0;
+ }
+ }
+
if (activation() && lp->segtype->ops->target_present &&
!lp->segtype->ops->target_present(cmd, NULL, NULL)) {
log_error("%s: Required device-mapper target(s) not "
@@ -485,7 +540,8 @@ static int _lvcreate_params(struct lvcreate_params *lp,
if (!_lvcreate_name_params(lp, cmd, &argc, &argv) ||
!_read_size_params(lp, lcp, cmd) ||
!_read_stripe_params(lp, cmd) ||
- !_read_mirror_params(lp, cmd))
+ !_read_mirror_params(lp, cmd) ||
+ !_read_replicator_params(lp, cmd))
return_0;
/*
diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
index 69e2c87..41204a4 100644
--- a/tools/lvmcmdline.c
+++ b/tools/lvmcmdline.c
@@ -488,6 +488,15 @@ int readahead_arg(struct cmd_context *cmd __attribute((unused)), struct arg *a)
return 1;
}
+int site_arg(struct cmd_context *cmd __attribute((unused)), struct arg *a)
+{
+ char *pos = a->value;
+ if (!validate_name(pos))
+ return 0;
+
+ return 1;
+}
+
static void __alloc(int size)
{
if (!(_cmdline.commands = dm_realloc(_cmdline.commands, sizeof(*_cmdline.commands) * size))) {
diff --git a/tools/tools.h b/tools/tools.h
index 75575e7..8dbabbc 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -152,6 +152,7 @@ int units_arg(struct cmd_context *cmd, struct arg *a);
int segtype_arg(struct cmd_context *cmd, struct arg *a);
int alloc_arg(struct cmd_context *cmd, struct arg *a);
int readahead_arg(struct cmd_context *cmd, struct arg *a);
+int site_arg(struct cmd_context *cmd, struct arg *a);
/* we use the enums to access the switches */
unsigned arg_count(const struct cmd_context *cmd, int a);
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 22/25] Replicator: man pages for lvcreate, lvchange
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (20 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 21/25] Replicator: add new options for replicator Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 23/25] Replicator: update copyright dates Zdenek Kabelac
` (2 subsequent siblings)
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Update man pages to cover basic usage of lvcreate and lvchange
utility to handle basic replicator commands.
Current desriptions shows how to create replicator,
add site, add replicated device.
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
man/lvchange.8.in | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
man/lvcreate.8.in | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 114 insertions(+), 1 deletions(-)
diff --git a/man/lvchange.8.in b/man/lvchange.8.in
index 08a83c4..0d091c9 100644
--- a/man/lvchange.8.in
+++ b/man/lvchange.8.in
@@ -3,10 +3,18 @@
lvchange \- change attributes of a logical volume
.SH SYNOPSIS
.B lvchange
+[\-\-addsite Site]
[\-\-addtag Tag]
[\-A|\-\-autobackup y|n] [\-a|\-\-available y|n|ey|en|ly|ln]
[\-\-alloc AllocationPolicy]
[\-C|\-\-contiguous y|n] [\-d|\-\-debug] [\-\-deltag Tag]
+[\-\-delsite Site]
+[[\-\-fallbehinddata Size[bBsSkKmMgGtTpPeE]] |
+[\-\-fallbehindios IOS] |
+[\-\-fallbehindtimeout sec]]
+[\-\-sitemode [sync|warn|stall|drop|fail]
+[\-\-activesite Site]
+[\-\-passivesite Site]
[\-\-resync]
[\-h|\-?|\-\-help]
[\-\-ignorelockingfailure]
@@ -19,7 +27,9 @@ lvchange \- change attributes of a logical volume
[\-p|\-\-permission r|rw] [\-r/\-\-readahead ReadAheadSectors|auto|none]
[\-\-refresh]
[\-t|\-\-test]
-[\-v|\-\-verbose] LogicalVolumePath [LogicalVolumePath...]
+[\-v|\-\-verbose]
+[\-\-remotevolumegroup VolumeGroupName]
+LogicalVolumePath [LogicalVolumePath...]
.SH DESCRIPTION
lvchange allows you to change the attributes of a logical volume
including making them known to the kernel ready for use.
@@ -102,10 +112,58 @@ If the logical volume is active, reload its metadata.
This is not necessary in normal operation, but may be useful
if something has gone wrong or if you're doing clustering
manually without a clustered lock manager.
+.TP
+.I \-\-addsite
+Add new site to given replicator LV.
+.TP
+.I \-\-delsite
+Remove given site from replicator LV.
+.TP
+.I \-\-fallbehinddata
+How many data could get replicator behind. Cannot be mixed
+with --fallbehindios or --fallbehindtimeout.
+.TP
+.I \-\-fallbehindios
+How many io operation could be queued in replicator backing store device.
+Cannot be mixed with --fallbehinddata or --fallbehindtimeout.
+.TP
+.I \-\-fallbehindtimeout
+How many seconds could be replicator behind actual data. Cannot be mixed
+with --fallbehinddata or --fallbehindios.
+.TP
+.I \-\-sitemode
+Select replication mode. Default is Warn.
+Sync is synchronous mode. Warn,Stall,Drop,Fail are asynchronous modes.
+Warn issues warning when remote site is switched to sync log.
+Stall stalls replicator until remote site is back in range.
+Drop drops whole remote site, if it get too behind.
+Fail whole replicator fails is remote sites gets too behind.
+Local site works usually in stall mode. There is no synclog for local
+replicated volumes.
+.TP
+.I \-\-activesite
+Marks site as active. Note: Only one site from replicator could be
+marked active with actual implementation and this site must be
+local site.
+.TP
+.I \-\-passivesite
+Marks site as passive which is default.
+.TP
+.I \-\-remotevolumegroup
+Selects remote volume group for remote site that contains logical volumes
+with same names for replication as the local site. Local site inside
+replicator's is assumed if remotevolumegroup is not specified.
+.TP
.SH Examples
"lvchange -pr vg00/lvol1" changes the permission on
volume lvol1 in volume group vg00 to be read-only.
+"lvchange --addsite NewYork vg00/replicator0"
+adds new local site NewYork in replicator vg00/replicator0.
+
+"lvchange --activesite NewYork vg00/replicator0"
+marks site NewYork in replicator vg00/replicator0 as active.
+
.SH SEE ALSO
.BR lvm (8),
.BR lvcreate (8),
diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in
index 314c354..decbf37 100644
--- a/man/lvcreate.8.in
+++ b/man/lvcreate.8.in
@@ -13,6 +13,8 @@ lvcreate \- create a logical volume in an existing volume group
[\-M|\-\-persistent y|n] [\-\-minor minor]
[\-m|\-\-mirrors Mirrors [\-\-nosync] [\-\-mirrorlog {disk|core}] [\-\-corelog]
[\-R|\-\-regionsize MirrorLogRegionSize]]
+[[\-\-replicatordev ReplicatedLogicalVolumeName] [\-\-site Site]]
+[\-R|\-\-regionsize ReplicatorSyncLogRegionSize]]
[\-n|\-\-name LogicalVolumeName]
[\-p|\-\-permission r|rw] [\-r|\-\-readahead ReadAheadSectors|auto|none]
[\-t|\-\-test]
@@ -31,6 +33,22 @@ VolumeGroupName [PhysicalVolumePath[:PE[-PE]]...]
OriginalLogicalVolumePath |
[\-s|\-\-snapshot]
VolumeGroupName \-\-virtualsize VirtualSize}
+.br
+
+.br
+.B lvcreate
+{\-l|\-\-extents LogicalExtentsNumber[%{VG|FREE|ORIGIN}] |
+ \-L|\-\-size LogicalVolumeSize[bBsSkKmMgGtTpPeE] |
+ \-\-replicatorlog ReplicatorLogLV}
+[\-\-replicatorlogtype ReplicatorLogType]
+[\-\-replicatorsynclog {disk|core}]
+[\-R|\-\-regionsize ReplicatorSyncLogRegionSize]]
+[\-\-nosync]
+\-n|\-\-name ReplicatorLogicalVolumeName
+\-\-replicator
+VolumeGroupName
+.br
+
.SH DESCRIPTION
lvcreate creates a new logical volume in a volume group ( see
.B vgcreate(8), vgchange(8)
@@ -114,6 +132,38 @@ by copying the data from the first device again each time the
device is activated, for example, after every reboot.
The optional argument --corelog is equivalent to --mirrorlog core.
+.TP
+.I \-\-replicator
+Creates empty replicator logical volume. ( see
+.B lvchange(8)
+) for options, how to customize created replicator LV.
+
+Specifying optional argument --nosync will cause the creation
+of the replicator to skip the initial resynchronization. Any data written
+afterwards will be replicator, but the original contents will not be
+copied. This is useful for skipping a potentially long and resource
+intensive initial sync of an empty device.
+
+The optional argument --replicatorsynclog specifies the type of synclog to be
+used. The default is disk, which is persistent and requires a small amount of
+storage space, usually on a separate device from the data being replicated.
+Using core means the replicator is regenerated by copying the data from the
+first device again each time the device is activated, for example, after every
+reboot.
+
+The optional argument --replicatorlog specifies the LogicalVolumeName of the
+LV to be used as the main backing store device for keeping replicator master
+log. If not specified, log is allocated with given -L|--size. Note: This
+backing store device should be very fast and reliable and storage (i.e. raid1),
+so should be selected with special care.
+
+The optional argument --replicatorlogtype specifies type of the backing store
+log. The default and currently the only valid and supported type is ringbuffer.
+
+.TP
+.I \-\-replicatordev
+Creates empty replicated logical volume. If the --site is not specified, local
+site is found inside replicator LV.
.TP
.I \-n, \-\-name LogicalVolumeName
@@ -220,10 +270,15 @@ under 100MB of actual data on it.
creates a linear logical volume "vg00/lvol1" using physical extents
/dev/sda:0-7 and /dev/sdb:0-7 for allocation of extents.
+"lvcreate -L 1G -n replicator0 vg00"
+.br
+creates an empty replicator logical volume "vg00/replicator0" and hidden backing
+store volume vg00/replicator0_rlog of size 1G.
.SH SEE ALSO
.BR lvm (8),
.BR vgcreate (8),
+.BR lvchange (8)
.BR lvremove (8),
.BR lvrename (8)
.BR lvextend (8),
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 23/25] Replicator: update copyright dates
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (21 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 22/25] Replicator: man pages for lvcreate, lvchange Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 24/25] Replicator: update generated lib/misc/configure.h.in Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 25/25] Replicator: update generated configure.in Zdenek Kabelac
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/activate/dev_manager.c | 2 +-
lib/metadata/segtype.h | 2 +-
libdm/libdm-deptree.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
index 451ba2b..a947e8f 100644
--- a/lib/activate/dev_manager.c
+++ b/lib/activate/dev_manager.c
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2002-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
diff --git a/lib/metadata/segtype.h b/lib/metadata/segtype.h
index d352928..89e2e98 100644
--- a/lib/metadata/segtype.h
+++ b/lib/metadata/segtype.h
@@ -1,6 +1,6 @@
/*
* Copyright (C) 2001-2004 Sistina Software, Inc. All rights reserved.
- * Copyright (C) 2004-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2004-2010 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
diff --git a/libdm/libdm-deptree.c b/libdm/libdm-deptree.c
index 885a9f9..9cb71a5 100644
--- a/libdm/libdm-deptree.c
+++ b/libdm/libdm-deptree.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2005-2007 Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2005-2010 Red Hat, Inc. All rights reserved.
*
* This file is part of the device-mapper userspace tools.
*
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 24/25] Replicator: update generated lib/misc/configure.h.in
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (22 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 23/25] Replicator: update copyright dates Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
2010-03-17 13:47 ` [PATCH 25/25] Replicator: update generated configure.in Zdenek Kabelac
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
lib/misc/configure.h.in | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/lib/misc/configure.h.in b/lib/misc/configure.h.in
index b0af63f..8e53fa0 100644
--- a/lib/misc/configure.h.in
+++ b/lib/misc/configure.h.in
@@ -416,6 +416,9 @@
/* Define to 1 to include the LVM readline shell. */
#undef READLINE_SUPPORT
+/* Define to 1 to include built-in support for replicators. */
+#undef REPLICATOR_INTERNAL
+
/* Define as the return type of signal handlers (`int' or `void'). */
#undef RETSIGTYPE
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH 25/25] Replicator: update generated configure.in
2010-03-17 13:46 [PATCH 00/25] Replicator Zdenek Kabelac
` (23 preceding siblings ...)
2010-03-17 13:47 ` [PATCH 24/25] Replicator: update generated lib/misc/configure.h.in Zdenek Kabelac
@ 2010-03-17 13:47 ` Zdenek Kabelac
24 siblings, 0 replies; 29+ messages in thread
From: Zdenek Kabelac @ 2010-03-17 13:47 UTC (permalink / raw)
To: lvm-devel
Signed-off-by: Zdenek Kabelac <zkabelac@redhat.com>
---
configure | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/configure b/configure
index 2d8d969..7fe7ad0 100755
--- a/configure
+++ b/configure
@@ -658,6 +658,7 @@ PTHREAD_LIBS
POOL
PKGCONFIG
OWNER
+REPLICATORS
MIRRORS
LVM_RELEASE_DATE
LVM_RELEASE
@@ -817,6 +818,7 @@ with_pool
with_cluster
with_snapshots
with_mirrors
+with_replicators
enable_readline
enable_realtime
with_clvmd
@@ -1549,6 +1551,7 @@ Optional Packages:
TYPE=internal
--with-mirrors=TYPE Mirror support: internal/shared/none
TYPE=internal
+ --with-replicators=TYPE Replicator support: internal/shared/none TYPE=none
--with-clvmd=TYPE Build cluster LVM Daemon.
The following cluster manager combinations are valid:
* cman,gulm (RHEL4 or equivalent)
@@ -9328,6 +9331,32 @@ _ACEOF
fi
################################################################################
+{ $as_echo "$as_me:$LINENO: checking whether to include replicators" >&5
+$as_echo_n "checking whether to include replicators... " >&6; }
+
+# Check whether --with-replicators was given.
+if test "${with_replicators+set}" = set; then
+ withval=$with_replicators; REPLICATORS=$withval
+else
+ REPLICATORS="none"
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $REPLICATORS" >&5
+$as_echo "$REPLICATORS" >&6; }
+
+case "$REPLICATORS" in
+ none|shared) ;;
+ internal)
+cat >>confdefs.h <<\_ACEOF
+#define REPLICATOR_INTERNAL 1
+_ACEOF
+ ;;
+ *) { { $as_echo "$as_me:$LINENO: error: --with-replicators parameter invalid ($REPLICATORS)" >&5
+$as_echo "$as_me: error: --with-replicators parameter invalid ($REPLICATORS)" >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+
+################################################################################
{ $as_echo "$as_me:$LINENO: checking whether to enable readline" >&5
$as_echo_n "checking whether to enable readline... " >&6; }
# Check whether --enable-readline was given.
@@ -15564,8 +15593,9 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
+
################################################################################
-ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile"
+ac_config_files="$ac_config_files Makefile make.tmpl daemons/Makefile daemons/clvmd/Makefile daemons/cmirrord/Makefile daemons/dmeventd/Makefile daemons/dmeventd/libdevmapper-event.pc daemons/dmeventd/plugins/Makefile daemons/dmeventd/plugins/lvm2/Makefile daemons/dmeventd/plugins/mirror/Makefile daemons/dmeventd/plugins/snapshot/Makefile doc/Makefile include/.symlinks include/Makefile lib/Makefile lib/format1/Makefile lib/format_pool/Makefile lib/locking/Makefile lib/mirror/Makefile lib/replicator/Makefile lib/misc/lvm-version.h lib/snapshot/Makefile libdm/Makefile libdm/libdevmapper.pc liblvm/Makefile liblvm/liblvm2app.pc man/Makefile po/Makefile scripts/clvmd_init_red_hat scripts/cmirrord_init_red_hat scripts/lvm2_monitoring_init_red_hat scripts/Makefile test/Makefile test/api/Makefile tools/Makefile udev/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -16183,6 +16213,7 @@ do
"lib/format_pool/Makefile") CONFIG_FILES="$CONFIG_FILES lib/format_pool/Makefile" ;;
"lib/locking/Makefile") CONFIG_FILES="$CONFIG_FILES lib/locking/Makefile" ;;
"lib/mirror/Makefile") CONFIG_FILES="$CONFIG_FILES lib/mirror/Makefile" ;;
+ "lib/replicator/Makefile") CONFIG_FILES="$CONFIG_FILES lib/replicator/Makefile" ;;
"lib/misc/lvm-version.h") CONFIG_FILES="$CONFIG_FILES lib/misc/lvm-version.h" ;;
"lib/snapshot/Makefile") CONFIG_FILES="$CONFIG_FILES lib/snapshot/Makefile" ;;
"libdm/Makefile") CONFIG_FILES="$CONFIG_FILES libdm/Makefile" ;;
--
1.7.0.1
^ permalink raw reply related [flat|nested] 29+ messages in thread