Skip to contentSkip to conversation

tabled: flip the switch to CLD-based configuration

PATCH In review Pete Zaitcev 1 participant 1 message Aug 29, 2009

lore
Share & tools
lore

Pete Zaitcev

author
#0 lore raw

PATCH 3/3 tabled: flip the switch to CLD-based configuration

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 <[email protected]>
test/chunkd-test.conf +1 -5
index 119aa00..9256b9d 100644
@@ -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>
test/tabled-test.conf +0 -4
index 0f23e17..7958505 100644
@@ -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>