Compare commits

...

4 Commits

Author SHA1 Message Date
6e83300d78 Increase ipmi plugin timeout 2023-10-04 19:21:59 -04:00
522da3fd95 Adjust wording for volume create too 2023-10-03 09:42:23 -04:00
3a1bf0724e Mention file_size as bytes 2023-10-03 09:39:19 -04:00
ee494fb1c0 Adjust the help text of storage pools
Makes some places clearer, cleans up cruft, and adds references to the
main documentation as required.
2023-10-02 11:46:12 -04:00
3 changed files with 8 additions and 8 deletions

View File

@ -4843,7 +4843,7 @@ class API_Storage_Ceph_Volume_Root(Resource):
{
"name": "size",
"required": True,
"helptext": "A volume size in bytes (or with k/M/G/T suffix) must be specified.",
"helptext": "A volume size in bytes (B implied or with SI suffix k/M/G/T) must be specified.",
},
]
)
@ -4869,7 +4869,7 @@ class API_Storage_Ceph_Volume_Root(Resource):
name: size
type: string
required: true
description: The volume size in bytes (or with a metric suffix, i.e. k/M/G/T)
description: The volume size, in bytes (B implied) or with a single-character SI suffix (k/M/G/T)
responses:
200:
description: OK
@ -5122,7 +5122,7 @@ class API_Storage_Ceph_Volume_Element_Upload(Resource):
name: file_size
type: integer
required: false
description: The size of the image file, if {image_format} is not "raw"
description: The size of the image file, in bytes, if {image_format} is not "raw"
responses:
200:
description: OK

View File

@ -3457,14 +3457,14 @@ def cli_storage_pool():
show_default=True,
required=False,
help="""
The replication configuration, specifying both a "copies" and "mincopies" value, separated by a comma, e.g. "copies=3,mincopies=2". The "copies" value specifies the total number of replicas and should not exceed the total number of nodes; the "mincopies" value specifies the minimum number of available copies to allow writes. For additional details please see the Cluster Architecture documentation.
The replication configuration, specifying both a "copies" and "mincopies" value, separated by a comma, e.g. "copies=3,mincopies=2". The "copies" value specifies the total number of replicas and the "mincopies" value specifies the minimum number of active replicas to allow I/O. For additional details please see the documentation.
""",
)
def cli_storage_pool_add(name, pgs, tier, replcfg):
"""
Add a new Ceph RBD pool with name NAME and PGS placement groups.
The placement group count must be a non-zero power of 2.
The placement group count must be a non-zero power of 2. Generally you should choose a PGS number such that there will be 50-150 PGs on each OSD in a single node (before replicas); 64, 128, or 256 are good values for small clusters (1-5 OSDs per node); higher values are recommended for higher node or OSD counts. For additional details please see the documentation.
"""
retcode, retmsg = pvc.lib.storage.ceph_pool_add(
@ -3503,9 +3503,9 @@ def cli_storage_pool_set_pgs(name, pgs):
"""
Set the placement groups (PGs) count for the pool NAME to PGS.
The placement group count must be a non-zero power of 2.
The placement group count must be a non-zero power of 2. Generally you should choose a PGS number such that there will be 50-150 PGs on each OSD in a single node (before replicas); 64, 128, or 256 are good values for small clusters (1-5 OSDs per node); higher values are recommended for higher node or OSD counts. For additional details please see the documentation.
Placement group counts may be increased or decreased as required though frequent alteration is not recommended.
Placement group counts may be increased or decreased as required though frequent alteration is not recommended. Placement group alterations are intensive operations on the storage cluster.
"""
retcode, retmsg = pvc.lib.storage.ceph_pool_set_pgs(CLI_CONFIG, name, pgs)

View File

@ -76,7 +76,7 @@ class MonitoringPluginScript(MonitoringPlugin):
ipmi_password = self.config["ipmi_password"]
retcode, _, _ = run_os_command(
f"/usr/bin/ipmitool -I lanplus -H {ipmi_hostname} -U {ipmi_username} -P {ipmi_password} chassis power status",
timeout=2
timeout=5
)
if retcode > 0: