ZOOKEEPER-107. Allow dynamic changes to server cluster membership (Al…

…ex Shraer via breed)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1453693 13f79535-47bb-0310-9956-ffa450edef68

.gitignore

@@ -4,6 +4,11 @@
 .revision/
 .settings/
 build/
+src/c/core.*
+src/c/TEST-*.txt
+src/c/*.la
+src/c/*.lo
+src/c/*.o
 src/c/generated/
 src/java/generated/
 src/java/lib/ant-eclipse-*

CHANGES.txt

@@ -10,6 +10,8 @@ NEW FEATURES:
   ZOOKEEPER-1355. Add zk.updateServerList(newServerList) (Alex Shraer, Marshall McMullen via fpj)
 
   ZOOKEEPER-1572. Add an async (Java) interface for multi request (Sijie Guo via camille)
+
+  ZOOKEEPER-107. Allow dynamic changes to server cluster membership (Alex Shraer via breed)
 
 BUGFIXES:
 

build.xml

@@ -1326,7 +1326,7 @@ xmlns:maven="antlib:org.apache.maven.artifact.ant">
                 <env key="CALLER" value="ANT"/>
                 <env key="CLOVER_HOME" value="${clover.home}"/>
                 <env key="base_dir" value="${basedir}"/>
-		<arg line="clean run-check"/>
+		<arg line="clean check"/>
 	</exec>
     </target>
 

src/c/Makefile.am

@@ -86,15 +86,19 @@ TEST_SOURCES = \
 	tests/TestZookeeperInit.cc \
 	tests/TestZookeeperClose.cc \
 	tests/TestReconfig.cc \
+	tests/TestReconfigServer.cc \
     tests/TestClientRetry.cc \
 	tests/TestOperations.cc \
 	tests/TestMulti.cc \
 	tests/TestClient.cc \
-	tests/TestWatchers.cc
+	tests/TestWatchers.cc \
+	tests/ZooKeeperQuorumServer.cc \
+	tests/ZooKeeperQuorumServer.h
 
 SYMBOL_WRAPPERS=$(shell cat ${srcdir}/tests/wrappers.opt)
 
 check_PROGRAMS = zktest-st
+TESTS_ENVIRONMENT = ZKROOT=${srcdir}/../..
 nodist_zktest_st_SOURCES = $(TEST_SOURCES)
 zktest_st_LDADD = libzkst.la libhashtable.la $(CPPUNIT_LIBS)
 zktest_st_CXXFLAGS = -DUSE_STATIC_LIB $(CPPUNIT_CFLAGS) $(USEIPV6)
@@ -109,11 +113,7 @@ if WANT_SYNCAPI
   zktest_mt_LDFLAGS = -static-libtool-libs $(SYMBOL_WRAPPERS_MT)
 endif
 
-run-check: check
-	./zktest-st $(TEST_OPTIONS)
-if WANT_SYNCAPI
-	./zktest-mt $(TEST_OPTIONS)
-endif
+TESTS = $(check_PROGRAMS)
 
 clean-local: clean-check
 	$(RM) $(DX_CLEANFILES)

src/c/README

@@ -64,7 +64,7 @@ tar downloaded from Apache please skip to step 2.
    Alternatively, you can also build and run a unit test suite (and
    you probably should).  Please make sure you have cppunit-1.10.x or
    higher installed before you execute step 4.  Once ./configure has
-   finished, do a "make run-check". It will build the libraries, build
+   finished, do a "make check". It will build the libraries, build
    the tests and run them.
 6) to generate doxygen documentation do a "make doxygen-doc". All
    documentations will be placed to a new subfolder named docs. By

src/c/include/proto.h

@@ -37,6 +37,7 @@ extern "C" {
 #define ZOO_CHECK_OP 13
 #define ZOO_MULTI_OP 14
 #define ZOO_CREATE2_OP 15
+#define ZOO_RECONFIG_OP 16
 #define ZOO_CLOSE_OP -11
 #define ZOO_SETAUTH_OP 100
 #define ZOO_SETWATCHES_OP 101