NCBC-108: Observe improvements to address failing tests

Wrong master node was being chosen. Tests rewritten to test for more clear scenarios. Change-Id: I6886b3bfe6b63fc0219068a1f0ca0a20bf478372 Reviewed-on: http://review.couchbase.org/20415 Reviewed-by: Matt Ingenthron <matt@couchbase.com> Tested-by: John C. Zablocki <john@couchbase.com>
couchbase · Sep 11, 2012 · 0ff75cb · 0ff75cb
1 parent 96db080
commit 0ff75cb
Show file tree

Hide file tree

Showing 7 changed files with 195 additions and 155 deletions.
diff --git a/src/Couchbase.Tests/App.config b/src/Couchbase.Tests/App.config
@@ -3,13 +3,40 @@
   <configSections>
     <section name="couchbase" type="Couchbase.Configuration.CouchbaseClientSection, Couchbase"/>
     <section name="min-config" type="Couchbase.Configuration.CouchbaseClientSection, Couchbase"/>
+    <sectionGroup name="enyim.com">
+      <section name="log" type="Enyim.Caching.Configuration.LoggerSection, Enyim.Caching" />
+    </sectionGroup>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
   </configSections>
+
+  <enyim.com>
+    <log factory="Enyim.Caching.Log4NetFactory, Enyim.Caching.Log4NetAdapter" />
+  </enyim.com>
+
+  <log4net debug="false">
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender,log4net">
+      <layout type="log4net.Layout.PatternLayout,log4net">
+        <param name="ConversionPattern" value="%d [%t] %-5p %c [%x] &lt;%X{auth}&gt; - %m%n" />
+      </layout>
+    </appender>
+    <root>
+      <priority value="ALL" />
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+
+    <logger name="ObserveHandler">
+      <level value="DEBUG" />
+    </logger>
+  </log4net>
+
   <couchbase>
-    <servers bucket="default" bucketPassword="" username="Administrator" password="qwerty">
-      <add uri="http://192.168.56.6:8091/pools" />
+    <servers bucket="default" bucketPassword="" username="Administrator" password="qwerty" observeTimeout="00:01:00">
+      <add uri="http://localhost:8091/pools" />
     </servers>
     <documentNameTransformer type="Couchbase.Configuration.DevelopmentModeNameTransformer, Couchbase" />
     <httpClientFactory type="Couchbase.HammockHttpClientFactory, Couchbase" />
+    <socketPool connectionTimeout="00:00:30"  />
   </couchbase>
 
   <min-config>

diff --git a/src/Couchbase.Tests/Couchbase.Tests.csproj b/src/Couchbase.Tests/Couchbase.Tests.csproj
@@ -31,6 +31,9 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
+      <HintPath>..\..\lib\EnyimMemcached\binaries\log4net\log4net.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>
@@ -98,6 +101,10 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\lib\EnyimMemcached\Enyim.Caching.Log4NetAdapter\Enyim.Caching.Log4NetAdapter.csproj">
+      <Project>{9D3F12E6-6BDD-4DED-8B25-D877780640B4}</Project>
+      <Name>Enyim.Caching.Log4NetAdapter</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\EnyimMemcached\Enyim.Caching\Enyim.Caching.csproj">
       <Project>{D438C0B3-A168-40B8-BDDD-61F0939DFF35}</Project>
       <Name>Enyim.Caching</Name>

diff --git a/src/Couchbase.Tests/CouchbaseClientObserveTests.cs b/src/Couchbase.Tests/CouchbaseClientObserveTests.cs
@@ -6,123 +6,96 @@
 using Enyim.Caching.Memcached;
 using Couchbase.Operations;
 using Couchbase.Operations.Constants;
+using Couchbase.Tests.Utils;
 
 namespace Couchbase.Tests
 {
 	[TestFixture]
 	public class CouchbaseClientObserveTests : CouchbaseClientTestsBase
 	{
+
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Succeed_When_Persist_Is_One_And_Replicate_Is_Default_Cas_Is_Same()
+		public void When_Storing_A_New_Key_Observe_Will_Succeed_With_Master_Only_Persistence()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value, PersistTo.One);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, PersistTo.One);
 			StoreAssertPass(storeResult);
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Succeed_When_Persist_Is_One_And_Cas_Is_Same()
+		public void When_Storing_A_New_Key_Observe_Will_Succeed_With_Master_Persistence_And_Single_Node_Replication()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, PersistTo.One, ReplicateTo.One);
 			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas, PersistTo.One, ReplicateTo.Zero);
-			Assert.That(observeResult.Success, Is.True, observeResult.Message);
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Fail_When_Persist_Is_One_And_Cas_Is_Different()
+		public void When_Storing_A_New_Key_Observe_Will_Succeed_With_Master_Persistence_And_Mutli_Node_Replication()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, PersistTo.One, ReplicateTo.Two);
 			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas - 1, PersistTo.One, ReplicateTo.Zero);
-			Assert.That(observeResult.Success, Is.Not.True);
-			Assert.That(observeResult.Message, Is.StringMatching(ObserveOperationConstants.MESSAGE_MODIFIED));
-
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Succeed_When_Persist_Is_Two_And_Cas_Is_Same()
+		public void When_Storing_A_New_Key_Observe_Will_Succeed_With_Multi_Node_Persistence()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, PersistTo.Two);
 			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas, PersistTo.Two, ReplicateTo.Zero);
-			Assert.That(observeResult.Success, Is.True, observeResult.Message);
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Fail_When_Persist_Is_Two_And_Cas_Is_Different()
+		public void When_Storing_A_New_Key_Observe_Will_Succeed_With_Multi_Node_Persistence_And_Single_Node_Replication()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, PersistTo.Two, ReplicateTo.One);
 			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas - 1, PersistTo.Two, ReplicateTo.Zero);
-			Assert.That(observeResult.Success, Is.Not.True);
-			Assert.That(observeResult.Message, Is.StringMatching(ObserveOperationConstants.MESSAGE_MODIFIED));
-
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Succeed_When_Persist_Is_Two_And_Replicate_Is_Two_And_Cas_Is_Same()
+		public void When_Storing_A_New_Key_Observe_Will_Succeed_With_Single_Node_Replication()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, ReplicateTo.One);
 			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas, PersistTo.Two, ReplicateTo.Two);
-			Assert.That(observeResult.Success, Is.True, observeResult.Message);
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Fail_When_Persist_Is_Two_And_Replicate_Is_Two_And_Cas_Is_Different()
+		public void When_Storing_A_New_Key_Observe_Will_Succeed_With_Multi_Node_Replication()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, ReplicateTo.One);
 			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas - 1, PersistTo.Two, ReplicateTo.Two);
-			Assert.That(observeResult.Success, Is.Not.True);
-			Assert.That(observeResult.Message, Is.StringMatching(ObserveOperationConstants.MESSAGE_MODIFIED));
-
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Succeed_When_Persist_Is_Zero_And_Replicate_Is_Two_And_Cas_Is_Same()
+		public void When_Storing_A_New_Key_Observe_Will_Fail_When_Cluster_Has_Too_Few_Nodes_For_Replication()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
-			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas, PersistTo.Two, ReplicateTo.Two);
-			Assert.That(observeResult.Success, Is.True, observeResult.Message);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2, ReplicateTo.Three);
+			Assert.That(storeResult.Success, Is.False);
 		}
 
 		[Test]
-		public void When_Storing_A_New_Key_Observe_Will_Fail_When_Persist_Is_Zero_And_Replicate_Is_Two_And_Cas_Is_Different()
+		public void When_Storing_A_New_Key_Observe_Will_Fail_With_Master_Persistence_And_Cas_Value_Has_Changed()
 		{
-			var key = GetUniqueKey("store");
-			var value = GetRandomString();
-			var storeResult = _Client.ExecuteStore(StoreMode.Set, key, value);
-			StoreAssertPass(storeResult);
-
-			var observeResult = _Client.Observe(key, storeResult.Cas - 1, PersistTo.Two, ReplicateTo.Two);
-			Assert.That(observeResult.Success, Is.Not.True);
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2);
+			var observeResult = _Client.Observe(kv.Item2, storeResult.Cas-1, PersistTo.One, ReplicateTo.Zero);
+			Assert.That(observeResult.Success, Is.False);
 			Assert.That(observeResult.Message, Is.StringMatching(ObserveOperationConstants.MESSAGE_MODIFIED));
+		}
 
+		[Test]
+		public void When_Storing_A_New_Key_Observe_Will_Fail_With_Master_Persistence_And_Replication_And_Cas_Value_Has_Changed()
+		{
+			var kv = KeyValueUtils.GenerateKeyAndValue("observe");
+			var storeResult = _Client.ExecuteStore(StoreMode.Set, kv.Item1, kv.Item2);
+			var observeResult = _Client.Observe(kv.Item2, storeResult.Cas - 1, PersistTo.One, ReplicateTo.Two);
+			Assert.That(observeResult.Success, Is.False);
+			Assert.That(observeResult.Message, Is.StringMatching(ObserveOperationConstants.MESSAGE_MODIFIED));
 		}
 	}
 }

diff --git a/src/Couchbase.Tests/CouchbaseClientTestsBase.cs b/src/Couchbase.Tests/CouchbaseClientTestsBase.cs
@@ -22,6 +22,8 @@ public abstract class CouchbaseClientTestsBase
 		public void SetUp()
 		{
 			_Client = CouchbaseClientFactory.CreateCouchbaseClient();
+
+			log4net.Config.XmlConfigurator.Configure();
 		}
 
 		protected string GetUniqueKey(string prefix = null)

diff --git a/src/Couchbase.sln b/src/Couchbase.sln
@@ -1,14 +1,16 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CouchbaseSample", "CouchbaseSample\CouchbaseSample.csproj", "{4ADBF446-1666-4728-9F72-EEBACC4E100C}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Couchbase", "Couchbase\Couchbase.csproj", "{708A2350-A26C-444D-B975-8164263951A7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Enyim.Caching", "..\lib\EnyimMemcached\Enyim.Caching\Enyim.Caching.csproj", "{D438C0B3-A168-40B8-BDDD-61F0939DFF35}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Couchbase.Tests", "Couchbase.Tests\Couchbase.Tests.csproj", "{B286E960-FC97-4ED5-97C1-BDB44DECD3A3}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Enyim.Caching.Log4NetAdapter", "..\lib\EnyimMemcached\Enyim.Caching.Log4NetAdapter\Enyim.Caching.Log4NetAdapter.csproj", "{9D3F12E6-6BDD-4DED-8B25-D877780640B4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CouchbaseSample", "CouchbaseSample\CouchbaseSample.csproj", "{4ADBF446-1666-4728-9F72-EEBACC4E100C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,16 +21,6 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|Mixed Platforms.Build.0 = Debug|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|x86.ActiveCfg = Debug|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|x86.Build.0 = Debug|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|Any CPU.ActiveCfg = Release|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|Mixed Platforms.ActiveCfg = Release|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|Mixed Platforms.Build.0 = Release|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|x86.ActiveCfg = Release|x86
-		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|x86.Build.0 = Release|x86
 		{708A2350-A26C-444D-B975-8164263951A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{708A2350-A26C-444D-B975-8164263951A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{708A2350-A26C-444D-B975-8164263951A7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -57,7 +49,28 @@ Global
 		{B286E960-FC97-4ED5-97C1-BDB44DECD3A3}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B286E960-FC97-4ED5-97C1-BDB44DECD3A3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{B286E960-FC97-4ED5-97C1-BDB44DECD3A3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{B286E960-FC97-4ED5-97C1-BDB44DECD3A3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{B286E960-FC97-4ED5-97C1-BDB44DECD3A3}.Release|x86.ActiveCfg = Release|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{9D3F12E6-6BDD-4DED-8B25-D877780640B4}.Release|x86.ActiveCfg = Release|Any CPU
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|x86.ActiveCfg = Debug|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Debug|x86.Build.0 = Debug|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|Any CPU.ActiveCfg = Release|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|Mixed Platforms.Build.0 = Release|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|x86.ActiveCfg = Release|x86
+		{4ADBF446-1666-4728-9F72-EEBACC4E100C}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/Couchbase/CouchbaseClient.cs b/src/Couchbase/CouchbaseClient.cs
@@ -455,6 +455,7 @@ protected IGetOperationResult PerformTryGetAndTouch(string key, uint nextExpirat
 		public IStoreOperationResult ExecuteStore(StoreMode mode, string key, object value, PersistTo persistTo, ReplicateTo replciateTo)
 		{
 			var storeResult = base.ExecuteStore(mode, key, value);
+
 			var observeResult = Observe(key, storeResult.Cas, persistTo, replciateTo);
 
 			if (observeResult.Success)
@@ -524,11 +525,11 @@ public IStoreOperationResult ExecuteStore(StoreMode mode, string key, object val
 
 			if (observeResult.Success)
 			{
-				storeResult.Pass();
+				observeResult.Combine(storeResult);
 			}
 			else
 			{
-				observeResult.Copy(storeResult);
+				observeResult.Combine(storeResult);
 			}
 
 			return storeResult;