From 5a5bdb8afb320aec2c341ff20fb99f7223d14f1d Mon Sep 17 00:00:00 2001 From: Zhongjie Wu Date: Fri, 31 Jan 2014 15:07:59 -0800 Subject: [PATCH] Print original XML for ZoneShrinkageCLI --- src/java/voldemort/tools/ZoneShrinkageCLI.java | 7 +++++-- test/unit/voldemort/tools/ZoneShrinkageCLITest.java | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java/voldemort/tools/ZoneShrinkageCLI.java b/src/java/voldemort/tools/ZoneShrinkageCLI.java index f775c74de4..77f1e43d88 100644 --- a/src/java/voldemort/tools/ZoneShrinkageCLI.java +++ b/src/java/voldemort/tools/ZoneShrinkageCLI.java @@ -203,6 +203,9 @@ public void executeShrink(boolean realRun) { String initialStoresXml = adminClient.metadataMgmtOps.getRemoteMetadata(initialClusterFirstNodeId, STORES_KEY).getValue(); logger.info("End fetching metadata for server " + initialClusterFirstNodeId); + logger.info("Original cluster.xml: \n" + initialClusterXml + "\n"); + logger.info("Original stores.xml: \n" + initialStoresXml + "\n"); + // Query the servers to see if all have the same XML shouldContinue = verifyMetadataConsistency(adminClient, initialClusterNodes, initialClusterXml, initialStoresXml); if(!shouldContinue) { @@ -214,8 +217,8 @@ public void executeShrink(boolean realRun) { String newStoresXml = shrinkStoresXml(initialStoresXml, droppingZoneId); String newClusterXml = shrinkClusterXml(initialClusterXml, droppingZoneId); - logger.info("New cluster.xml: \n" + newClusterXml); - logger.info("New stores.xml: \n" + newStoresXml); + logger.info("New cluster.xml: \n" + newClusterXml + "\n"); + logger.info("New stores.xml: \n" + newStoresXml + "\n"); // Verifying Server rebalancing states shouldContinue = verifyRebalanceState(adminClient, initialClusterNodes); diff --git a/test/unit/voldemort/tools/ZoneShrinkageCLITest.java b/test/unit/voldemort/tools/ZoneShrinkageCLITest.java index e94925245f..8af106e16b 100644 --- a/test/unit/voldemort/tools/ZoneShrinkageCLITest.java +++ b/test/unit/voldemort/tools/ZoneShrinkageCLITest.java @@ -15,7 +15,6 @@ */ package voldemort.tools; -import org.junit.Before; import org.junit.Test; import voldemort.ClusterTestUtils; import voldemort.ServerTestUtils;