Merge lp:~sdqali/openstack-guest-agents/windows-agent-key-read-fix into lp:openstack-guest-agents

[sdqali]

XenStore Agent ignores message keys whose files were removed by the client due to timeout. These will be reissued by the client.

[lp:~sdqali/openstack-guest-agents/windows-agent-key-read-fix]

106. By Chris Behrens on 2012-01-12

Merged lp:~sdqali/openstack-guest-agents/windows-agent-key-read-fix

=== modified file 'windows/xenserver/src/Rackspace.Cloud.Server.Agent.Specs/XenStoreSpec.cs'
--- windows/xenserver/src/Rackspace.Cloud.Server.Agent.Specs/XenStoreSpec.cs	2011-03-02 21:56:51 +0000
+++ windows/xenserver/src/Rackspace.Cloud.Server.Agent.Specs/XenStoreSpec.cs	2012-01-12 06:41:24 +0000
@@ -1,4 +1,7 @@
-using NUnit.Framework;
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using Rackspace.Cloud.Server.Agent.Configuration;
 using Rackspace.Cloud.Server.Agent.Interfaces;
 using Rhino.Mocks;
 
@@ -17,12 +20,27 @@
         }
 
         [Test]
-        public void should_call_executable_implementation_with_the_right_parameters_when_writing_to_xenstore()
+        public void Should_call_executable_implementation_with_the_right_parameters_when_writing_to_xenstore()
         {
-            
             xenStore.Write("name1", "value1");
-
             executable.AssertWasCalled(x => x.Run(Constants.XenClientPath, "write data/guest/name1 value1"));
         }
+
+        [Test]
+        public void Should_Ignore_MessageKeys_For_Which_The_File_Was_Removed()
+        {
+            var messageKey = Guid.NewGuid().ToString();
+            executable.Expect(process => process.Run(Constants.XenClientPath, "dir " + Constants.WritableDataHostBase)).Return(ExecutableResult(messageKey));
+            executable.Expect(
+                process => process.Run(Constants.XenClientPath, string.Format("read data/host/{0}", messageKey))).Return(
+                    ExecutableResult(string.Format("reading data/host/{0}: The system cannot find the file specified.", messageKey)));
+            var commands = xenStore.GetCommands();
+            Assert.IsTrue(commands.Count == 0);
+        }
+
+        private static ExecutableResult ExecutableResult(string messageKey)
+        {
+            return new ExecutableResult  { Output = new List<string>{messageKey} };
+        }
     }
 }

=== modified file 'windows/xenserver/src/Rackspace.Cloud.Server.Agent/XenStore.cs'
--- windows/xenserver/src/Rackspace.Cloud.Server.Agent/XenStore.cs	2011-03-04 00:43:41 +0000
+++ windows/xenserver/src/Rackspace.Cloud.Server.Agent/XenStore.cs	2012-01-12 06:41:24 +0000
@@ -13,6 +13,7 @@
 //    License for the specific language governing permissions and limitations
 //    under the License.
 
+using System;
 using System.Collections.Generic;
 using Rackspace.Cloud.Server.Agent.Configuration;
 using Rackspace.Cloud.Server.Agent.Interfaces;
@@ -34,16 +35,18 @@
             var messageKeysAsUuids = Read(Constants.WritableDataHostBase).ValidateAndClean();
             IList<Command> commands = new List<Command>();
 
-            foreach (var messageKey in messageKeysAsUuids) {
-                var command = new Json<Command>().Deserialize(ReadKey(messageKey));
-                command.key = messageKey;
-                commands.Add(command);
+            foreach (var messageKey in messageKeysAsUuids) {
+                var result = ReadKey(messageKey);
+                if (result.Contains("The system cannot find the file specified.")) continue;
+                var command = new Json<Command>().Deserialize(result);
+                command.key = messageKey;
+                commands.Add(command);
             }
-
             return commands;
         }
 
-        public string ReadKey(string key) {
+        public string ReadKey(string key)
+        {
             var result = _executableProcess.Run(Constants.XenClientPath, "read " + Constants.Combine(Constants.WritableDataHostBase, key));
             return result.Output.First();
         }