Revision 8584e922 lib/constants.py

b/lib/constants.py
966 966
LDP_DISK_CUSTOM = "disk-custom"
967 967
LDP_NET_CUSTOM = "net-custom"
968 968
LDP_DYNAMIC_RESYNC = "dynamic-resync"
969
LDP_PLAN_AHEAD = "c-plan-ahead"
970
LDP_FILL_TARGET = "c-fill-target"
971
LDP_DELAY_TARGET = "c-delay-target"
972
LDP_MAX_RATE = "c-max-rate"
973
LDP_MIN_RATE = "c-min-rate"
969 974
DISK_LD_TYPES = {
970 975
  LDP_RESYNC_RATE: VTYPE_INT,
971 976
  LDP_STRIPES: VTYPE_INT,
......
975 980
  LDP_DISK_CUSTOM: VTYPE_STRING,
976 981
  LDP_NET_CUSTOM: VTYPE_STRING,
977 982
  LDP_DYNAMIC_RESYNC: VTYPE_BOOL,
983
  LDP_PLAN_AHEAD: VTYPE_INT,
984
  LDP_FILL_TARGET: VTYPE_INT,
985
  LDP_DELAY_TARGET: VTYPE_INT,
986
  LDP_MAX_RATE: VTYPE_INT,
987
  LDP_MIN_RATE: VTYPE_INT,
978 988
  }
979 989
DISK_LD_PARAMETERS = frozenset(DISK_LD_TYPES.keys())
980 990

  
......
989 999
DRBD_DISK_CUSTOM = "disk-custom"
990 1000
DRBD_NET_CUSTOM = "net-custom"
991 1001
DRBD_DYNAMIC_RESYNC = "dynamic-resync"
1002
DRBD_PLAN_AHEAD = "c-plan-ahead"
1003
DRBD_FILL_TARGET = "c-fill-target"
1004
DRBD_DELAY_TARGET = "c-delay-target"
1005
DRBD_MAX_RATE = "c-max-rate"
1006
DRBD_MIN_RATE = "c-min-rate"
992 1007
LV_STRIPES = "stripes"
993 1008
DISK_DT_TYPES = {
994 1009
  DRBD_RESYNC_RATE: VTYPE_INT,
......
1000 1015
  DRBD_DISK_CUSTOM: VTYPE_STRING,
1001 1016
  DRBD_NET_CUSTOM: VTYPE_STRING,
1002 1017
  DRBD_DYNAMIC_RESYNC: VTYPE_BOOL,
1018
  DRBD_PLAN_AHEAD: VTYPE_INT,
1019
  DRBD_FILL_TARGET: VTYPE_INT,
1020
  DRBD_DELAY_TARGET: VTYPE_INT,
1021
  DRBD_MAX_RATE: VTYPE_INT,
1022
  DRBD_MIN_RATE: VTYPE_INT,
1003 1023
  LV_STRIPES: VTYPE_INT,
1004 1024
  }
1005 1025

  
......
1781 1801
    LDP_DISK_CUSTOM: "",
1782 1802
    LDP_NET_CUSTOM: "",
1783 1803
    LDP_DYNAMIC_RESYNC: False,
1804

  
1805
    # The default values for the DRBD dynamic resync speed algorithm are taken
1806
    # from the drbsetup 8.3.11 man page, except for c-plan-ahead (that we
1807
    # don't need to set to 0, because we have a separate option to enable it)
1808
    # and for c-max-rate, that we cap to the default value for the static resync
1809
    # rate.
1810
    LDP_PLAN_AHEAD: 20, # ds
1811
    LDP_FILL_TARGET: 0, # sectors
1812
    LDP_DELAY_TARGET: 1, # ds
1813
    LDP_MAX_RATE: CLASSIC_DRBD_SYNC_SPEED, # KiB/s
1814
    LDP_MIN_RATE: 4 * 1024, # KiB/s
1784 1815
    },
1785 1816
  LD_LV: {
1786 1817
    LDP_STRIPES: _autoconf.LVM_STRIPECOUNT
......
1791 1822
    },
1792 1823
  }
1793 1824

  
1825
# readability shortcuts
1826
_LV_DEFAULTS = DISK_LD_DEFAULTS[LD_LV]
1827
_DRBD_DEFAULTS = DISK_LD_DEFAULTS[LD_DRBD8]
1828

  
1794 1829
DISK_DT_DEFAULTS = {
1795 1830
  DT_PLAIN: {
1796 1831
    LV_STRIPES: DISK_LD_DEFAULTS[LD_LV][LDP_STRIPES],
1797 1832
    },
1798 1833
  DT_DRBD8: {
1799
    DRBD_RESYNC_RATE: DISK_LD_DEFAULTS[LD_DRBD8][LDP_RESYNC_RATE],
1800
    DRBD_DATA_STRIPES: DISK_LD_DEFAULTS[LD_LV][LDP_STRIPES],
1801
    DRBD_META_STRIPES: DISK_LD_DEFAULTS[LD_LV][LDP_STRIPES],
1802
    DRBD_DISK_BARRIERS: DISK_LD_DEFAULTS[LD_DRBD8][LDP_BARRIERS],
1803
    DRBD_META_BARRIERS: DISK_LD_DEFAULTS[LD_DRBD8][LDP_NO_META_FLUSH],
1804
    DRBD_DEFAULT_METAVG: DISK_LD_DEFAULTS[LD_DRBD8][LDP_DEFAULT_METAVG],
1805
    DRBD_DISK_CUSTOM: DISK_LD_DEFAULTS[LD_DRBD8][LDP_DISK_CUSTOM],
1806
    DRBD_NET_CUSTOM: DISK_LD_DEFAULTS[LD_DRBD8][LDP_NET_CUSTOM],
1807
    DRBD_DYNAMIC_RESYNC: DISK_LD_DEFAULTS[LD_DRBD8][LDP_DYNAMIC_RESYNC],
1834
    DRBD_RESYNC_RATE: _DRBD_DEFAULTS[LDP_RESYNC_RATE],
1835
    DRBD_DATA_STRIPES: _LV_DEFAULTS[LDP_STRIPES],
1836
    DRBD_META_STRIPES: _LV_DEFAULTS[LDP_STRIPES],
1837
    DRBD_DISK_BARRIERS: _DRBD_DEFAULTS[LDP_BARRIERS],
1838
    DRBD_META_BARRIERS: _DRBD_DEFAULTS[LDP_NO_META_FLUSH],
1839
    DRBD_DEFAULT_METAVG: _DRBD_DEFAULTS[LDP_DEFAULT_METAVG],
1840
    DRBD_DISK_CUSTOM: _DRBD_DEFAULTS[LDP_DISK_CUSTOM],
1841
    DRBD_NET_CUSTOM: _DRBD_DEFAULTS[LDP_NET_CUSTOM],
1842
    DRBD_DYNAMIC_RESYNC: _DRBD_DEFAULTS[LDP_DYNAMIC_RESYNC],
1843
    DRBD_PLAN_AHEAD: _DRBD_DEFAULTS[LDP_PLAN_AHEAD],
1844
    DRBD_FILL_TARGET: _DRBD_DEFAULTS[LDP_FILL_TARGET],
1845
    DRBD_DELAY_TARGET: _DRBD_DEFAULTS[LDP_DELAY_TARGET],
1846
    DRBD_MAX_RATE: _DRBD_DEFAULTS[LDP_MAX_RATE],
1847
    DRBD_MIN_RATE: _DRBD_DEFAULTS[LDP_MIN_RATE],
1808 1848
    },
1809 1849
  DT_DISKLESS: {
1810 1850
    },
......
1816 1856
    },
1817 1857
  }
1818 1858

  
1859
# we don't want to export the shortcuts
1860
del _LV_DEFAULTS, _DRBD_DEFAULTS
1861

  
1819 1862
NICC_DEFAULTS = {
1820 1863
  NIC_MODE: NIC_MODE_BRIDGED,
1821 1864
  NIC_LINK: DEFAULT_BRIDGE,

Also available in: Unified diff