From c28502b11678ab5e2abe5ab5e5bcc35352b7fb79 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Tue, 27 Jul 2010 17:07:20 -0400
Subject: [PATCH] Rename masterfailover to master-failover
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Most (all?) of our commands use dash-separator: replace-disks,
verify-disks, add-tags, etc. βgnt-cluster masterfailoverβ is an old
exception to this rule.
The patch replaces it with master-failover, add a compatiblity alias,
and updates the documentation for this change.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
doc/admin.rst | 2 +-
lib/cmdlib.py | 2 +-
man/ganeti-masterd.sgml | 4 ++--
man/ganeti.sgml | 2 +-
man/gnt-cluster.sgml | 4 ++--
qa/qa_cluster.py | 6 +++---
scripts/gnt-cluster | 11 +++++++++--
7 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/doc/admin.rst b/doc/admin.rst
index c61b77ff4..1918dbe3b 100644
--- a/doc/admin.rst
+++ b/doc/admin.rst
@@ -680,7 +680,7 @@ Failing over the master node
If you want to promote a different node to the master role (for whatever
reason), run on any other master-candidate node the command::
- gnt-cluster masterfailover
+ gnt-cluster master-failover
and the node you ran it on is now the new master. In case you try to run
this on a non master-candidate node, you will get an error telling you
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 8124d4b29..d994004eb 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -3965,7 +3965,7 @@ class LUSetNodeParams(LogicalUnit):
# we can't change the master's node flags
if self.op.node_name == self.cfg.GetMasterNode():
raise errors.OpPrereqError("The master role can be changed"
- " only via masterfailover",
+ " only via master-failover",
errors.ECODE_INVAL)
diff --git a/man/ganeti-masterd.sgml b/man/ganeti-masterd.sgml
index 859699b80..7bd56c1ab 100644
--- a/man/ganeti-masterd.sgml
+++ b/man/ganeti-masterd.sgml
@@ -75,8 +75,8 @@
<para>
The only action that can be done without the master daemon is
the failover of the master role to another node in the
- cluster, via the <command>gnt-cluster masterfailover</command>
- command.
+ cluster, via the <command>gnt-cluster
+ master-failover</command> command.
</para>
<para>
diff --git a/man/ganeti.sgml b/man/ganeti.sgml
index 7caad06ef..74d4499f8 100644
--- a/man/ganeti.sgml
+++ b/man/ganeti.sgml
@@ -110,7 +110,7 @@
<listitem>
<para>The node receives the full cluster configuration
(configuration file and jobs) and can become a master
- via the <command>gnt-cluster masterfailover</command>
+ via the <command>gnt-cluster master-failover</command>
command. Nodes that are not in this state cannot
transition into the master role due to missing
state.</para>
diff --git a/man/gnt-cluster.sgml b/man/gnt-cluster.sgml
index 02abe2d88..da3e5473e 100644
--- a/man/gnt-cluster.sgml
+++ b/man/gnt-cluster.sgml
@@ -564,10 +564,10 @@
</refsect2>
<refsect2>
- <title>MASTERFAILOVER</title>
+ <title>MASTER-FAILOVER</title>
<cmdsynopsis>
- <command>masterfailover</command>
+ <command>master-failover</command>
<arg>--no-voting</arg>
</cmdsynopsis>
diff --git a/qa/qa_cluster.py b/qa/qa_cluster.py
index 13e8f7203..d715694d2 100644
--- a/qa/qa_cluster.py
+++ b/qa/qa_cluster.py
@@ -320,16 +320,16 @@ def TestClusterBurnin():
def TestClusterMasterFailover():
- """gnt-cluster masterfailover"""
+ """gnt-cluster master-failover"""
master = qa_config.GetMasterNode()
failovermaster = qa_config.AcquireNode(exclude=master)
try:
- cmd = ['gnt-cluster', 'masterfailover']
+ cmd = ['gnt-cluster', 'master-failover']
AssertEqual(StartSSH(failovermaster['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
- cmd = ['gnt-cluster', 'masterfailover']
+ cmd = ['gnt-cluster', 'master-failover']
AssertEqual(StartSSH(master['primary'],
utils.ShellQuoteArgs(cmd)).wait(), 0)
finally:
diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index f5ad94210..5a2b6c563 100755
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -854,7 +854,7 @@ commands = {
'repair-disk-sizes': (
RepairDiskSizes, ARGS_MANY_INSTANCES, [],
"", "Updates mismatches in recorded disk sizes"),
- 'masterfailover': (
+ 'master-failover': (
MasterFailover, ARGS_NONE, [NOVOTING_OPT],
"", "Makes the current node the master"),
'version': (
@@ -914,5 +914,12 @@ commands = {
}
+#: dictionary with aliases for commands
+aliases = {
+ 'masterfailover': 'master-failover',
+}
+
+
if __name__ == '__main__':
- sys.exit(GenericMain(commands, override={"tag_type": constants.TAG_CLUSTER}))
+ sys.exit(GenericMain(commands, override={"tag_type": constants.TAG_CLUSTER},
+ aliases=aliases))
--
GitLab