Revision 8002e46b
b/lib/cmdlib.py | ||
---|---|---|
8172 | 8172 |
constants.LDP_RESYNC_RATE: dt_params[constants.DRBD_RESYNC_RATE], |
8173 | 8173 |
constants.LDP_BARRIERS: dt_params[constants.DRBD_DISK_BARRIERS], |
8174 | 8174 |
constants.LDP_NO_META_FLUSH: dt_params[constants.DRBD_META_BARRIERS], |
8175 |
constants.LDP_DEFAULT_METAVG: dt_params[constants.DRBD_DEFAULT_METAVG], |
|
8175 | 8176 |
} |
8176 | 8177 |
|
8177 | 8178 |
drbd_params = \ |
... | ... | |
8290 | 8291 |
names.append(lv_prefix + "_meta") |
8291 | 8292 |
for idx, disk in enumerate(disk_info): |
8292 | 8293 |
disk_index = idx + base_index |
8294 |
drbd_default_metavg = drbd_params[constants.LDP_DEFAULT_METAVG] |
|
8293 | 8295 |
data_vg = disk.get(constants.IDISK_VG, vgname) |
8294 |
meta_vg = disk.get(constants.IDISK_METAVG, data_vg)
|
|
8296 |
meta_vg = disk.get(constants.IDISK_METAVG, drbd_default_metavg)
|
|
8295 | 8297 |
disk_dev = _GenerateDRBD8Branch(lu, primary_node, remote_node, |
8296 | 8298 |
disk[constants.IDISK_SIZE], |
8297 | 8299 |
[data_vg, meta_vg], |
... | ... | |
9301 | 9303 |
constants.IDISK_SIZE: size, |
9302 | 9304 |
constants.IDISK_MODE: mode, |
9303 | 9305 |
constants.IDISK_VG: data_vg, |
9304 |
constants.IDISK_METAVG: disk.get(constants.IDISK_METAVG, data_vg), |
|
9305 | 9306 |
} |
9307 |
if constants.IDISK_METAVG in disk: |
|
9308 |
new_disk[constants.IDISK_METAVG] = disk[constants.IDISK_METAVG] |
|
9306 | 9309 |
if constants.IDISK_ADOPT in disk: |
9307 | 9310 |
new_disk[constants.IDISK_ADOPT] = disk[constants.IDISK_ADOPT] |
9308 | 9311 |
self.disks.append(new_disk) |
b/lib/constants.py | ||
---|---|---|
935 | 935 |
LDP_STRIPES = "stripes" |
936 | 936 |
LDP_BARRIERS = "disabled-barriers" |
937 | 937 |
LDP_NO_META_FLUSH = "disable-meta-flush" |
938 |
LDP_DEFAULT_METAVG = "default-metavg" |
|
938 | 939 |
DISK_LD_TYPES = { |
939 | 940 |
LDP_RESYNC_RATE: VTYPE_INT, |
940 | 941 |
LDP_STRIPES: VTYPE_INT, |
941 | 942 |
LDP_BARRIERS: VTYPE_STRING, |
942 | 943 |
LDP_NO_META_FLUSH: VTYPE_BOOL, |
944 |
LDP_DEFAULT_METAVG: VTYPE_STRING, |
|
943 | 945 |
} |
944 | 946 |
DISK_LD_PARAMETERS = frozenset(DISK_LD_TYPES.keys()) |
945 | 947 |
|
... | ... | |
949 | 951 |
DRBD_META_STRIPES = "meta-stripes" |
950 | 952 |
DRBD_DISK_BARRIERS = "disk-barriers" |
951 | 953 |
DRBD_META_BARRIERS = "meta-barriers" |
954 |
DRBD_DEFAULT_METAVG = "metavg" |
|
952 | 955 |
LV_STRIPES = "stripes" |
953 | 956 |
DISK_DT_TYPES = { |
954 | 957 |
DRBD_RESYNC_RATE: VTYPE_INT, |
... | ... | |
956 | 959 |
DRBD_META_STRIPES: VTYPE_INT, |
957 | 960 |
DRBD_DISK_BARRIERS: VTYPE_STRING, |
958 | 961 |
DRBD_META_BARRIERS: VTYPE_BOOL, |
962 |
DRBD_DEFAULT_METAVG: VTYPE_STRING, |
|
959 | 963 |
LV_STRIPES: VTYPE_INT, |
960 | 964 |
} |
961 | 965 |
|
... | ... | |
1729 | 1733 |
LDP_RESYNC_RATE: CLASSIC_DRBD_SYNC_SPEED, |
1730 | 1734 |
LDP_BARRIERS: _autoconf.DRBD_BARRIERS, |
1731 | 1735 |
LDP_NO_META_FLUSH: _autoconf.DRBD_NO_META_FLUSH, |
1736 |
LDP_DEFAULT_METAVG: DEFAULT_VG, |
|
1732 | 1737 |
}, |
1733 | 1738 |
LD_LV: { |
1734 | 1739 |
LDP_STRIPES: _autoconf.LVM_STRIPECOUNT |
... | ... | |
1749 | 1754 |
DRBD_META_STRIPES: DISK_LD_DEFAULTS[LD_LV][LDP_STRIPES], |
1750 | 1755 |
DRBD_DISK_BARRIERS: DISK_LD_DEFAULTS[LD_DRBD8][LDP_BARRIERS], |
1751 | 1756 |
DRBD_META_BARRIERS: DISK_LD_DEFAULTS[LD_DRBD8][LDP_NO_META_FLUSH], |
1757 |
DRBD_DEFAULT_METAVG: DISK_LD_DEFAULTS[LD_DRBD8][LDP_DEFAULT_METAVG], |
|
1752 | 1758 |
}, |
1753 | 1759 |
DT_DISKLESS: { |
1754 | 1760 |
}, |
Also available in: Unified diff