From: Pete Zaitcev <zaitcev@redhat.com>
Subject: [Patch 3/3] tabled: flip the switch to CLD-based configuration
Date: Fri, 28 Aug 2009 20:42:07 -0600
Message-ID: <20090828204207.6f2f9a69@redhat.com>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Return-path: <hail-devel-owner@vger.kernel.org>
Sender: hail-devel-owner@vger.kernel.org
List-ID: <hail-devel.vger.kernel.org>
Content-Type: text/plain; charset="us-ascii"
To: Jeff Garzik <jeff@garzik.org>
Cc: Project Hail List <hail-devel@vger.kernel.org>

This patch switches tabled from using <StorageNode> clause to reading
what Chunk posted into CLD. This is the default mode used in clouds,
so we want to test it during the build.

Note that tabled should boot normally and tolerate a delayed start-up
of Chunk in either mode, before and after the switch. This patch
demonstrates how to flip the two configuration files atomically.

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>

diff --git a/test/chunkd-test.conf b/test/chunkd-test.conf
index 119aa00..9256b9d 100644
--- a/test/chunkd-test.conf
+++ b/test/chunkd-test.conf
@@ -9,11 +9,7 @@
 </Listen>
 <PID>chunkd.pid</PID>
 <Path>data/chunk</Path>
-<!--
- Excluding NID prevents Chunk from registering with CLD and thus conflicting
- with itself as described by <StorageNode> in tabled.conf.
- -->
-<!-- <NID>1</NID> -->
+<NID>1</NID>
 <CLD>
   <Port>18081</Port>
   <Host>localhost</Host>
diff --git a/test/tabled-test.conf b/test/tabled-test.conf
index 0f23e17..7958505 100644
--- a/test/tabled-test.conf
+++ b/test/tabled-test.conf
@@ -5,10 +5,6 @@
 <TDB>data/tdb</TDB>
 <TDBRepPort>18083</TDBRepPort>
 
-<StorageNode>
-  <Port>18082</Port>
-  <Host>localhost</Host>
-</StorageNode>
 <CLD>
   <Port>18081</Port>
   <Host>localhost</Host>