From 1c826bced52fb82932d09a0e76dab786099087cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Mon, 17 Dec 2012 14:43:23 +0100 Subject: [PATCH] Bug #1694: Rollback cluster id when system DS is added to any cluster --- src/rm/RequestManagerCluster.cc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/rm/RequestManagerCluster.cc b/src/rm/RequestManagerCluster.cc index 73bcd3da75..6107511910 100644 --- a/src/rm/RequestManagerCluster.cc +++ b/src/rm/RequestManagerCluster.cc @@ -149,6 +149,18 @@ void RequestManagerCluster::add_generic( request_error("Cannot add object to cluster", err_msg), att); + // Rollback + get(object_id, true, &object, &cluster_obj); + + if ( object != 0 ) + { + cluster_obj->set_cluster(old_cluster_id, old_cluster_name); + + pool->update(object); + + object->unlock(); + } + return; }