Revision 8a69b3a8 lib/constants.py

b/lib/constants.py
472 472
# drbd constants
473 473
DRBD_HMAC_ALG = "md5"
474 474
DRBD_NET_PROTOCOL = "C"
475
DRBD_BARRIERS = _autoconf.DRBD_BARRIERS
475

  
476
# drbd barrier types
477
DRBD_B_NONE = "n"
478
DRBD_B_DISK_BARRIERS = "b"
479
DRBD_B_DISK_DRAIN = "d"
480
DRBD_B_DISK_FLUSH = "f"
481

  
482
# Valid barrier combinations: "n" or any non-null subset of "bfd"
483
DRBD_VALID_BARRIER_OPT = frozenset([
484
  frozenset([DRBD_B_NONE]),
485
  frozenset([DRBD_B_DISK_BARRIERS]),
486
  frozenset([DRBD_B_DISK_DRAIN]),
487
  frozenset([DRBD_B_DISK_FLUSH]),
488
  frozenset([DRBD_B_DISK_DRAIN, DRBD_B_DISK_FLUSH]),
489
  frozenset([DRBD_B_DISK_DRAIN, DRBD_B_DISK_FLUSH]),
490
  frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_DRAIN]),
491
  frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_FLUSH]),
492
  frozenset([DRBD_B_DISK_BARRIERS, DRBD_B_DISK_FLUSH, DRBD_B_DISK_DRAIN]),
493
  ])
476 494

  
477 495
# file backend driver
478 496
FD_LOOP = "loop"
......
898 916
# Logical Disks parameters
899 917
RESYNC_RATE = "resync-rate"
900 918
STRIPES = "stripes"
919
BARRIERS = "disabled-barriers"
920
NO_META_FLUSH = "disable-meta-flush"
901 921
DISK_LD_TYPES = {
902 922
  RESYNC_RATE: VTYPE_INT,
903 923
  STRIPES: VTYPE_INT,
924
  BARRIERS: VTYPE_STRING,
925
  NO_META_FLUSH: VTYPE_BOOL,
904 926
  }
905 927
DISK_LD_PARAMETERS = frozenset(DISK_LD_TYPES.keys())
906 928

  
......
908 930
DRBD_RESYNC_RATE = "resync-rate"
909 931
DRBD_DATA_STRIPES = "data-stripes"
910 932
DRBD_META_STRIPES = "meta-stripes"
933
DRBD_DISK_BARRIERS = "disk-barriers"
934
DRBD_META_BARRIERS = "meta-barriers"
911 935
LV_STRIPES = "stripes"
912 936
DISK_DT_TYPES = {
913 937
  DRBD_RESYNC_RATE: VTYPE_INT,
914 938
  DRBD_DATA_STRIPES: VTYPE_INT,
915 939
  DRBD_META_STRIPES: VTYPE_INT,
940
  DRBD_DISK_BARRIERS: VTYPE_STRING,
941
  DRBD_META_BARRIERS: VTYPE_BOOL,
916 942
  LV_STRIPES: VTYPE_INT,
917 943
  }
918 944

  
......
1683 1709
DISK_LD_DEFAULTS = {
1684 1710
  LD_DRBD8: {
1685 1711
    RESYNC_RATE: CLASSIC_DRBD_SYNC_SPEED,
1712
    BARRIERS: _autoconf.DRBD_BARRIERS,
1713
    NO_META_FLUSH: _autoconf.DRBD_NO_META_FLUSH,
1686 1714
    },
1687 1715
  LD_LV: {
1688 1716
    STRIPES: _autoconf.LVM_STRIPECOUNT
......
1701 1729
    DRBD_RESYNC_RATE: DISK_LD_DEFAULTS[LD_DRBD8][RESYNC_RATE],
1702 1730
    DRBD_DATA_STRIPES: DISK_LD_DEFAULTS[LD_LV][STRIPES],
1703 1731
    DRBD_META_STRIPES: DISK_LD_DEFAULTS[LD_LV][STRIPES],
1732
    DRBD_DISK_BARRIERS: DISK_LD_DEFAULTS[LD_DRBD8][BARRIERS],
1733
    DRBD_META_BARRIERS: DISK_LD_DEFAULTS[LD_DRBD8][NO_META_FLUSH],
1704 1734
    },
1705 1735
  DT_DISKLESS: {
1706 1736
    },

Also available in: Unified diff