You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2016/01/18 15:57:26 UTC

[2/2] git commit: updated refs/heads/4.7 to f0fca60

Merge pull request #1336 from nitin-maharana/CloudStack-Nitin19_4.7

CLOUDSTACK-9231: Root volume migration from one primary to another primary storage within the same cluster is failingEXPECTED BEHAVIOUR:
====================
Root Volume migration within cluster should work.

ACTUAL BEHAVIOUR:
==================
Root volume migration within cluster failed.

This situation arises when there are two management server accessing the same database.
When the migration request comes the command is forwarded from one management server to another because the host is owned by the second management server. So, serialisation of map from one to another fails.

Fix:
===
This is fixed by converting the maps to lists.

* pr/1336:
  CLOUDSTACK-9231: Root volume migration from one primary to another primary storage within the same cluster is failing

Signed-off-by: Remi Bergsma <gi...@remi.nl>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0fca609
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0fca609
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0fca609

Branch: refs/heads/4.7
Commit: f0fca609937885006df5c5e59ae6504d0559f99d
Parents: 1f1da0f 40e3dfc
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Jan 18 15:57:05 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Jan 18 15:57:05 2016 +0100

----------------------------------------------------------------------
 .../agent/api/MigrateWithStorageCommand.java    |  7 ++++
 .../api/MigrateWithStorageReceiveAnswer.java    | 12 +++---
 .../api/MigrateWithStorageReceiveCommand.java   |  9 +++--
 .../api/MigrateWithStorageSendCommand.java      | 12 +++---
 ...MigrateWithStorageReceiveCommandWrapper.java | 17 +++++----
 ...610MigrateWithStorageSendCommandWrapper.java | 30 ++++++++++-----
 .../motion/XenServerStorageMotionStrategy.java  | 11 +++---
 .../xenbase/XenServer610WrapperTest.java        | 40 ++++++++++----------
 8 files changed, 82 insertions(+), 56 deletions(-)
----------------------------------------------------------------------