Statistics
| Branch: | Tag: | Revision:

root / tools / cluster-merge @ d0ffa390

History | View | Annotate | Download (26 kB)

# Date Author Comment
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...