Statistics
| Branch: | Tag: | Revision:

root / tools / cluster-merge @ 4fe43605

History | View | Annotate | Download (30.1 kB)

# Date Author Comment
e8c86ab1 10/09/2013 07:39 pm Klaus Aehlig

Merge branch 'stable-2.9' into master

  • stable-2.9
    Version bump for 2.9.0 rc2
    Update NEWS for 2.9.0 rc2
    Downgrade 'vif_script'
    Downgrade 'xen_cmd'
    Add test cluster config for version 2.9
    Remove superfluous import of 'errors'
    Start NEWS entry for 2.9.0 rc2...
66a37e7a 10/07/2013 04:58 pm Helga Velroyen

Rename LDS_DRBD to DTS_DRBD

This patch renames the constant 'LDS_DRBD' to 'DTS_DRBD'
to make it consistent with the renaming of LD_* constants
to DT_* constants.

Signed-off-by: Helga Velroyen <>
Reviewed-by: Thomas Thrainer <>

204eb58c 09/24/2013 09:17 am Thomas Thrainer

Remove physical_id field reference from tools

Remove remaining references to the physical_id field in cluster-merge
and sanitize-config.

Signed-off-by: Thomas Thrainer <>
Reviewed-by: Jose A. Lopes <>

78d0e710 07/29/2013 03:27 pm Helga Velroyen

Cluster-merge: determine shared file storage use from config

This patch makes cluster merge read the cluster's
configuration to find out whether or not shared
file storage is enabled.

Signed-off-by: Helga Velroyen <>
Reviewed-by: Thomas Thrainer <>

6a34eb01 07/15/2013 12:34 pm Helga Velroyen

cluster-merge: remove usage of 'ENABLE_FILE_STORAGE'

This patch adjusts the cluster-merge tool so that it does
no longer check the constant 'ENABLE_FILE_STORAGE' but
the clusters' configurations.

Signed-off-by: Helga Velroyen <>
Reviewed-by: Klaus Aehlig <>

b8028dcf 12/19/2012 06:29 pm Michael Hanselmann

Replace frozenset with compat.UniqueFrozenset

This is not a trivial s/frozenset/compat.UniqueFrozenset/, but rather
only replaces “frozenset” where appropriate. Most of the places are
“static” information that doesn't change after the module has been
loaded....

796b5152 11/27/2012 12:54 pm Michael Hanselmann

Factorize logging setup in tools

Most tools had their own “SetupLogging” function, but they were all
essentially the same. This patch adds a generic version to “utils.log”
and provides unit tests.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Guido Trotter <>

224ff0f7 10/26/2012 05:27 pm Michael Hanselmann

gnt-node add: Use prepare-node-join

This patch changes “gnt-node add” to use the newly added
“prepare-node-join” tool. Hereby Paramiko is no longer a hard dependency
for setting up SSH on nodes.

In “gnt_cluster.py”, a positional parameter is no longer passed as a...

09bf5d24 09/18/2012 06:11 pm Michael Hanselmann

Migrate tools/* from constants to pathutils

File system paths moved from constants to pathutils.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

5ae4945a 08/23/2012 02:41 pm Iustin Pop

Bump pep8 version to 1.2

Debian Wheezy will ship with this version, and it has many improved checks compared to 0.6, so let's:

- bump version in the docs
- silence some new checks that are wrong due to our indent=2 instead of 4
- fix lots of errors in the code where the indentation was wrong by 1...

3ccb3a64 02/21/2012 05:23 pm Michael Hanselmann

Replace single- with double-quotes

In at least two cases "%s" is replaced with str(), too.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

58ea8d17 01/19/2012 02:42 pm Michael Hanselmann

Fix wrong option names in QA and cluster-merge

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

419bb2ef 10/04/2011 09:12 pm Guido Trotter

cluster-merge: log an info message at node readd

node readd can take a long time, it's good to have info messages to see
progress.

Signed-off-by: Guido Trotter <>
Reviewed-by: Andrea Spadaccini <>

aeb24d97 09/30/2011 04:37 pm Guido Trotter

Use --yes to deactivate master ip in cluster merge

Signed-off-by: Guido Trotter <>
Reviewed-by: Andrea Spadaccini <>

a3fad332 09/30/2011 03:43 pm Andrea Spadaccini

Use deactivate-master-ip in cluster-merge

Use the gnt-cluster deactivate-master-ip command in cluster-merge to
disable the master IP.

Signed-off-by: Andrea Spadaccini <>
Reviewed-by: Michael Hanselmann <>
Reviewed-by: Guido Trotter <>...

b459a848 08/30/2011 11:24 am Andrea Spadaccini

DeprecationWarning fixes for pylint

In version 0.21, pylint unified all the disable-* (and enable-*)
directives to disable (resp. enable). This leads to a lot of
DeprecationWarning being emitted even if one uses the recommended
version of pylint (0.21.1, as stated in devnotes.rst)....

b972c223 08/26/2011 03:03 pm Andrea Spadaccini

Delete master IPs from mergee master nodes

Added a step in cluster-merge that removes the cluster IP from the
master node of the mergee clusters.

Signed-off-by: Andrea Spadaccini <>
Reviewed-by: Michael Hanselmann <>

e687ec01 08/25/2011 01:53 pm Michael Hanselmann

PEP8 style fixes

Identified using the “pep8” utility.

Signed-off-by: Michael Hanselmann <>
Reviewed-by: Iustin Pop <>

b7bf8b58 08/24/2011 05:34 pm Guido Trotter

Wrap a few long lines

Had to break it as well, today! ;)

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

7f4d4cf0 08/23/2011 02:39 pm Guido Trotter

Remove wrong type declaration from option

Signed-off-by: Guido Trotter <>
Reviewed-by: Andrea Spadaccini <>

006a51b3 08/23/2011 02:22 pm Andrea Spadaccini

Fix wrong method name in cluster-merge

Fixed a wrong method name in the last patch.

Signed-off-by: Andrea Spadaccini <>
Reviewed-by: Michael Hanselmann <>

b3f287c8 08/23/2011 12:51 pm Guido Trotter

Fix --skip-stop-instances help message

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

1fb5f905 08/23/2011 12:46 pm Andrea Spadaccini

cluster-merge: Add the --skip-stop-instances opt

This option allows to do a check for running instances on the mergee
clusters instead of stopping them.

Signed-off-by: Andrea Spadaccini <>
Signed-off-by: Guido Trotter <>...

503cc75f 08/21/2011 04:47 pm Guido Trotter

Try 3 times before giving up on per-node commands

When contacting lots of nodes some may fail. Give it a couple more
chances before giving up on them.

Possible future TODO: continue, but just mark them as offline.

Signed-off-by: Guido Trotter <>...

07ff0a78 08/21/2011 04:47 pm Andrea Spadaccini

Allow retrying commands in cluster-merge

Signed-off-by: Andrea Spadaccini <>
Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

cc2cccfc 08/21/2011 04:47 pm Guido Trotter

Add a TODO on the VerifyCluster option

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

d47319e2 08/21/2011 04:47 pm Guido Trotter

Transform node readd exceptions into just errors

We are after the point of no return, no point in failing everything
because a node failed to readd. Better to just report it and move on.

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

3e22caed 08/21/2011 04:47 pm Guido Trotter

Offline node when adding it to a merged cluster

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

1fcd3b81 08/08/2011 03:22 pm Guido Trotter

cluster-merge: implement params delta mercifulness

Sometimes it's good to tell the user about parameter differences but
then proceed anyway. Strictness is still enforced for those parameters
that would break the cluster (volume group name, storage dir if file...

bb074298 08/08/2011 03:22 pm Guido Trotter

cluster-merge: consider file storage enable state

There's no point in checking whether the file storage dir in the two
clusters is the same if file storage is not even enabled

Signed-off-by: Guido Trotter <>
Reviewed-by: Michael Hanselmann <>

2be7c4cc 07/26/2011 11:55 am Guido Trotter

cluster-merge: remove a hardcoded constant

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

d2b17e37 07/26/2011 11:38 am Guido Trotter

cluster-merge: remove option list from usage

It doesn't make sense to have to keep them up to date twice, and --help
already lists all of them with help strings.

Signed-off-by: Guido Trotter <>
Reviewed-by: Iustin Pop <>

620a9c62 07/26/2011 11:38 am Guido Trotter

cluster-merge: add instance restart strategy opt

Right now we always restart all instances, which is not right if some
instances were already down for other reasons. Thus we add an option to
decide how to handle this. The right default should be "up" which is:...

76ae1d65 04/07/2011 12:46 pm Michael Hanselmann

Merge branch 'stable-2.4' into devel-2.4

  • stable-2.4:
    Add error checking and merging for cluster params
    Clarify --force-join parameter message
    Treat empty oob_program param as default
    Fix bug in instance listing with orphan instances
    Fix bug related to log opening failures...
a6c8fd10 03/28/2011 12:54 pm Stephen Shirley

Add error checking and merging for cluster params

Set the default stderr logging level to WARNING so the relevant output
can be seen.

Signed-off-by: Stephen Shirley <>
Reviewed-by: René Nussbaumer <>

8864d152 03/11/2011 07:06 pm Guido Trotter

Revert "Only merge nodes that are known to not be offline"

This reverts commit 288f240f62dafa8bd8ba7482c8367adbdf6d96c2.

That commit was buggy at various levels:
- broke ssh access to the second cluster, making cluster-merge
unusable (unless ssh key were previously setup?)...

8697f0fa 03/11/2011 07:06 pm Guido Trotter

cluster-merge: only operate on online nodes

The node list in MergerData is used only to:
- stop ganeti on the nodes
- readd the nodes to the cluster
As such offline nodes should be skipped from it.

Signed-off-by: Guido Trotter <>...

288f240f 03/10/2011 06:36 pm Stephen Shirley

Only merge nodes that are known to not be offline

Otherwise the readd will fail, breaking the merge.

Signed-off-by: Stephen Shirley <>
Reviewed-by: Iustin Pop <>

9b945588 02/18/2011 06:09 pm Stephen Shirley

Fix pylint warnings

- 1 80-char line infraction
- 4 changes in how arguments are passed to logging functions
- 3 pylint disable-msg's because cluster-merge needs to access ganeti
config internals

Signed-off-by: Stephen Shirley <>
Signed-off-by: Guido Trotter <>...

3a969900 02/18/2011 04:46 pm Stephen Shirley

Add support for merging node groups

Signed-off-by: Stephen Shirley <>
Reviewed-by: Michael Hanselmann <>

1a615be0 02/18/2011 04:46 pm Stephen Shirley

Add option to rename groups on conflict

Signed-off-by: Stephen Shirley <>
Reviewed-by: Michael Hanselmann <>

98632c4f 02/17/2011 12:09 pm Stephen Shirley

Don't remove master_candidate flag from merged nodes

Prevents lots of spurious warnings like:
2011-02-10 17:00:22,776: CRITICAL Configuration data is not consistent:
Not enough master candidates: actual 3, target 4

Signed-off-by: Stephen Shirley <>...

a536aaac 02/17/2011 12:09 pm Stephen Shirley

Use a consistent ECID base

ECID was being calculated completely differently in
__MergeNodeGroups() and _MergeConfig()

Signed-off-by: Stephen Shirley <>
Reviewed-by: Michael Hanselmann <>

3d8f154f 02/14/2011 01:19 pm Stephen Shirley

Revert "Disable the cluster-merge tool for the moment"

This reverts commit c0711f2cb989facd60430ab18c5b0e59a1f279ac.

Signed-off-by: Stephen Shirley <>
Signed-off-by: Iustin Pop <>
Reviewed-by: Iustin Pop <>

9c03a67a 02/14/2011 01:18 pm Stephen Shirley

Fix cluster-merging by not stopping noded

cli.RunWhileClusterStopped() stops noded on all of the nodes in the
original cluster. This prevents /etc/hosts updates on the master, and
config redistribution doesn't reach the other nodes in the original
cluster. As all we want to do is merge while the master is stopped,...

3d2e7a27 02/09/2011 10:56 am Stephen Shirley

Minor reordering to match param order

Signed-off-by: Stephen Shirley <>
Signed-off-by: Iustin Pop <>
Reviewed-by: Iustin Pop <>

53991408 02/04/2011 04:23 pm Stephen Shirley

Use gnt-node add --force-join to add foreign nodes

Signed-off-by: Stephen Shirley <>
Signed-off-by: Iustin Pop <>
Reviewed-by: Iustin Pop <>

6323e232 02/04/2011 04:20 pm Stephen Shirley

Fix iterating over node groups

Current line tries to unpack dict incorrectly

Signed-off-by: Stephen Shirley <>
Signed-off-by: Iustin Pop <>
Reviewed-by: Iustin Pop <>

c0711f2c 02/04/2011 12:12 pm Iustin Pop

Disable the cluster-merge tool for the moment

Hopefully this can be fixed before the final 2.4 release…

Signed-off-by: Iustin Pop <>
Reviewed-by: René Nussbaumer <>
Reviewed-by: Stephen Shirley <>

8f44674f 02/01/2011 02:15 pm Stephen Shirley

Merge node groups from other cluster

Signed-off-by: Stephen Shirley <>
Reviewed-by: René Nussbaumer <>

71bbe910 01/31/2011 05:38 pm Stephen Shirley

Fix grammar of var naming

flatten is the verb, flattened is the adjective.

Signed-off-by: Stephen Shirley <>
Reviewed-by: Michael Hanselmann <>

be8aecab 01/31/2011 05:38 pm Stephen Shirley

cluster-merge should refuse to merge own cluster

Also fix type of Merger.cluster_name from list to string. This would
have triggered an error in sshRunner if cluster keys were in use.

Signed-off-by: Stephen Shirley <>
Reviewed-by: Guido Trotter <>

e1ab08db 01/27/2011 05:38 pm Stephen Shirley

Open other clusters' config in foreign mode

Signed-off-by: Stephen Shirley <>
Signed-off-by: Iustin Pop <>
Reviewed-by: Iustin Pop <>

caedacde 01/27/2011 05:36 pm Stephen Shirley

Add (unused) arg to _OfflineClusterMerge

cli._RunWhileClusterStoppedHelper.Call passes (self, *args) to functions
called via cli.RunWhileClusterStoppedHelper(). The code in cluster-merge
was broken by commit d8aab233.

Signed-off-by: Stephen Shirley <>...

d8aab233 04/20/2010 12:38 pm René Nussbaumer

Using the added stop-all functionality from daemon-utils in cluster-merge

Additionally also move to the RunWhileStopped method for the configuration merger.

Signed-off-by: René Nussbaumer <>
Reviewed-by: Guido Trotter <>...

454723b5 04/15/2010 05:37 pm Iustin Pop

Update docstrings in tools/ and enable epydoc

This patch updates the docstrings in tools/ (mostly in lvmstrap, which
is very very old code-base) and then enabled the tools in this directory
for 'make apidoc' too.

Signed-off-by: Iustin Pop <>...

691e9563 04/13/2010 02:21 pm Iustin Pop

Mark cluster-merge as executable

Signed-off-by: Iustin Pop <>
Reviewed-by: René Nussbaumer <>

c4feafe8 03/08/2010 03:48 pm Iustin Pop

Switch from os.path.join to utils.PathJoin

This passes a full burnin with lots of instances, and should be safe as
we mostly to join a known root (various constants) to a run-time
variable.

Signed-off-by: Iustin Pop <>
Reviewed-by: Michael Hanselmann <>

3f1cf151 02/26/2010 03:43 pm René Nussbaumer

Make pylint happy

I was using a too old version which doesn't got all those. This
patch is fixing the new lint errors.

Signed-off-by: René Nussbaumer <>
Reviewed-by: Michael Hanselmann <>

1f7d3f7d 02/26/2010 02:41 pm René Nussbaumer

Adding tool for automated cluster-merger

This is the implementation of docs/design-cluster-merger.rst. It allows
the automatic merging of one or more clusters into the invoking cluster.

While this version is tested and working it still needs some tweaking...