On Tue, Oct 7, 2014 at 3:00 PM, 'Aaron Karper' via ganeti-devel
<[email protected]> wrote:
> The documentation explains how LUMoveInstance, LUInstanceFailover, and
> LUInstanceMigrate are related.
>
> Signed-off-by: Aaron Karper <[email protected]>
> ---
> lib/cmdlib/instance.py | 11 +++++++++++
> lib/cmdlib/instance_migration.py | 19 +++++++++++++++++--
> 2 files changed, 28 insertions(+), 2 deletions(-)
>
> diff --git a/lib/cmdlib/instance.py b/lib/cmdlib/instance.py
> index 9659ca7..ea8b72d 100644
> --- a/lib/cmdlib/instance.py
> +++ b/lib/cmdlib/instance.py
> @@ -2055,6 +2055,17 @@ class LUInstanceRemove(LogicalUnit):
> class LUInstanceMove(LogicalUnit):
> """Move an instance by data-copying.
>
> + This LU is only used if the instance needs to be moved by copying the data
> + from one node in the cluster to another. The instance is shut down and
> + the data is copied to the new node and the configuration change is
> propagated,
> + then the instance is started again.
> +
> + See also:
> + L{LUInstanceFailover}
> + for moving an instance on shared storage (no copying required).
> +
> + L{LUInstanceMigrate}
> + for the live migration of an instance (no shutdown required).
> """
> HPATH = "instance-move"
> HTYPE = constants.HTYPE_INSTANCE
> diff --git a/lib/cmdlib/instance_migration.py
> b/lib/cmdlib/instance_migration.py
> index 164f3b5..196b205 100644
> --- a/lib/cmdlib/instance_migration.py
> +++ b/lib/cmdlib/instance_migration.py
> @@ -113,6 +113,15 @@ def _DeclareLocksForMigration(lu, level):
> class LUInstanceFailover(LogicalUnit):
> """Failover an instance.
>
> + This is migration by shutting the instance down, but with the disks
> + of the instance available on the new node.
s/instance available/instance already available/
> +
> + See also:
> + L{LUInstanceMove}
> + for moving an instance by copying the data.
> +
> + L{LUInstanceMigrate}
> + for the live migration of an instance (no shutdown required).
> """
> HPATH = "instance-failover"
> HTYPE = constants.HTYPE_INSTANCE
> @@ -182,9 +191,15 @@ class LUInstanceFailover(LogicalUnit):
> class LUInstanceMigrate(LogicalUnit):
> """Migrate an instance.
>
> - This is migration without shutting down, compared to the failover,
> - which is done with shutdown.
> + This is migration without shutting down (live migration) and the disks are
> + already available on the new node.
> +
> + See also:
> + L{LUInstanceMove}
> + for moving an instance by copying the data.
>
> + L{LUInstanceFailover}
> + for the migration of an instance where a shutdown is required.
> """
> HPATH = "instance-migrate"
> HTYPE = constants.HTYPE_INSTANCE
> --
> 2.1.0.rc2.206.gedb03e5
>
Rest LGTM.
I love this patch improving documentation, thanks!
Cheers,
Michele
--
Google Germany GmbH
Dienerstr. 12
80331 München
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschäftsführer: Graham Law, Christine Elizabeth Flores
