From 9b94905f720cd78d9b05eb79c673cc8b9866473f Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Tue, 27 Oct 2009 12:13:01 +0900 Subject: [PATCH] Rename the node storage commands MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To reduce confusion, the following gnt-node commands are renamed: - physical-volumes → list-storage - modify-volume → modify-storage - repair-volume → repair-storage The NEWS file is update accordingly and it also gets emacs local variables. Signed-off-by: Iustin Pop Reviewed-by: Michael Hanselmann --- NEWS | 10 +++++++--- man/gnt-node.sgml | 30 ++++++++++++++++-------------- scripts/gnt-node | 18 +++++++++--------- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/NEWS b/NEWS index 1d7fdb8..7404d10 100644 --- a/NEWS +++ b/NEWS @@ -43,8 +43,8 @@ Details - ``/2/nodes/[node_name]/storage/repair`` - Added OpCodes to evacuate or migrate all instances on a node -- Added new command to list physical volumes on nodes (``gnt-node - physical-volumes``) and to modify them (``gnt-node modify-volume``) +- Added new command to list storage elements on nodes (``gnt-node + list-storage``) and modify them (``gnt-node modify-storage``) - Added new ssconf files with master candidate IP address (``ssconf_master_candidates_ips``), node primary IP address (``ssconf_node_primary_ips``) and node secondary IP address @@ -57,7 +57,7 @@ Details --auto``) - Added ``gnt-instance recreate-disks`` to re-create (empty) disks after catastrophic data-loss -- Added ``gnt-node repair-volume`` command to repair damanged LVM volume +- Added ``gnt-node repair-storage`` command to repair damaged LVM volume groups - Added ``gnt-instance move`` command to move instances - Added ``gnt-cluster watcher`` command to control watcher @@ -522,3 +522,7 @@ Version 1.2b2 - Other small bugfixes .. vim: set textwidth=72 : +.. Local Variables: +.. mode: rst +.. fill-column: 72 +.. End: diff --git a/man/gnt-node.sgml b/man/gnt-node.sgml index 836fc5d..6b8d9b1 100644 --- a/man/gnt-node.sgml +++ b/man/gnt-node.sgml @@ -756,10 +756,10 @@ node1.example.com /dev/hdc1 xenvg instance1.example.com-sda_11001.data 256 inst - PHYSICAL-VOLUMES + LIST-STORAGE - physical-volumes + list-storage --no-headers --human-readable --separator=SEPARATOR @@ -770,7 +770,8 @@ node1.example.com /dev/hdc1 xenvg instance1.example.com-sda_11001.data 256 inst - Lists all physical volumes and their details from the node(s) provided. + Lists the available storage units and their details for the + given node(s). @@ -855,7 +856,7 @@ node1.example.com /dev/hdc1 xenvg instance1.example.com-sda_11001.data 256 inst Example: -# gnt-node physical-volumes node5.example.com +# gnt-node list-storage node5.example.com Node Name Size Used Free node5.example.com /dev/sda7 673.8G 0M 673.8G node5.example.com /dev/sdb1 698.6G 1.3G 697.4G @@ -864,10 +865,10 @@ node5.example.com /dev/sdb1 698.6G 1.3G 697.4G - MODIFY-VOLUME + MODIFY-STORAGE - modify-volume + modify-storage node @@ -876,31 +877,32 @@ node5.example.com /dev/sdb1 698.6G 1.3G 697.4G - Modifies storage volumes on a node. Only LVM physical volumes can be - modified at the moment. They have a storage type of lvm-pv. + Modifies storage volumes on a node. Only LVM physical volumes + can be modified at the moment. They have a storage type + of lvm-pv. Example: -# gnt-node modify-volume --allocatable no node5.example.com lvm-pv /dev/sdb1 +# gnt-node modify-storage --allocatable no node5.example.com lvm-pv /dev/sdb1 - REPAIR-VOLUME + REPAIR-STORAGE - repair-volume + repair-storage node storage-type volume-name - Repairs a storage volume on a node. Only LVM volume groups can be - repaired at this time. They have the storage type + Repairs a storage volume on a node. Only LVM volume groups can + be repaired at this time. They have the storage type lvm-vg. @@ -918,7 +920,7 @@ node5.example.com /dev/sdb1 698.6G 1.3G 697.4G Example: -# gnt-node repair-volume node5.example.com lvm-vg xenvg +# gnt-node repair-storage node5.example.com lvm-vg xenvg diff --git a/scripts/gnt-node b/scripts/gnt-node index 564c125..68be359 100755 --- a/scripts/gnt-node +++ b/scripts/gnt-node @@ -458,7 +458,7 @@ def ListVolumes(opts, args): return 0 -def ListPhysicalVolumes(opts, args): +def ListStorage(opts, args): """List physical volumes on node(s). @param opts: the command line options selected by the user @@ -530,7 +530,7 @@ def ListPhysicalVolumes(opts, args): return 0 -def ModifyVolume(opts, args): +def ModifyStorage(opts, args): """Modify storage volume on a node. @param opts: the command line options selected by the user @@ -557,7 +557,7 @@ def ModifyVolume(opts, args): SubmitOpCode(op) -def RepairVolume(opts, args): +def RepairStorage(opts, args): """Repairs a storage volume on a node. @param opts: the command line options selected by the user @@ -667,19 +667,19 @@ commands = { ListVolumes, [ArgNode()], [NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT], "[...]", "List logical volumes on node(s)"), - 'physical-volumes': ( - ListPhysicalVolumes, ARGS_MANY_NODES, + 'list-storage': ( + ListStorage, ARGS_MANY_NODES, [NOHDR_OPT, SEP_OPT, USEUNITS_OPT, FIELDS_OPT, _STORAGE_TYPE_OPT], "[...]", "List physical volumes on node(s)"), - 'modify-volume': ( - ModifyVolume, + 'modify-storage': ( + ModifyStorage, [ArgNode(min=1, max=1), ArgChoice(min=1, max=1, choices=_MODIFIABLE_STORAGE_TYPES), ArgFile(min=1, max=1)], [ALLOCATABLE_OPT], " ", "Modify storage volume on a node"), - 'repair-volume': ( - RepairVolume, + 'repair-storage': ( + RepairStorage, [ArgNode(min=1, max=1), ArgChoice(min=1, max=1, choices=_REPAIRABLE_STORAGE_TYPES), ArgFile(min=1, max=1)], -- 1.7.10.4