Switch HueBotSample from SFStateful to SFStateless. (microsoftgraph#248)

satyakonmsft · May 29, 2020 · 8e199d1 · 8e199d1
1 parent 6e69b1b
commit 8e199d1
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 32 deletions.
diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/Bot/Bot.cs b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/Bot/Bot.cs
@@ -43,7 +43,7 @@ public class Bot
         /// <param name="options">The bot options.</param>
         /// <param name="graphLogger">The graph logger.</param>
         /// <param name="serviceContext">Service context.</param>
-        public Bot(BotOptions options, IGraphLogger graphLogger, StatefulServiceContext serviceContext)
+        public Bot(BotOptions options, IGraphLogger graphLogger, StatelessServiceContext serviceContext)
         {
             this.Options = options;
             this.logger = graphLogger;
@@ -320,7 +320,7 @@ private CallHandler GetHandlerOrThrow(string callId)
         /// <param name="options">The bot options.</param>
         /// <param name="serviceContext">Service context.</param>
         /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        private MediaPlatformSettings MediaInit(BotOptions options, StatefulServiceContext serviceContext)
+        private MediaPlatformSettings MediaInit(BotOptions options, StatelessServiceContext serviceContext)
         {
             var instanceNumber = serviceContext.NodeInstance();
             var publicMediaUrl = options.BotMediaProcessorUrl ?? options.BotBaseUrl;

diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/Controllers/JoinCallController.cs b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/Controllers/JoinCallController.cs
@@ -18,19 +18,19 @@ namespace Sample.HueBot.Controllers
     public class JoinCallController : Controller
     {
         private Bot bot;
-        private StatefulServiceContext statefulServiceContext;
+        private StatelessServiceContext statelessServiceContext;
         private BotOptions botOptions;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="JoinCallController"/> class.
         /// </summary>
         /// <param name="bot">Bot instance.</param>
-        /// <param name="statefulServiceContext">The service context.</param>
+        /// <param name="statelessServiceContext">The service context.</param>
         /// <param name="botOptions">The bot options.</param>
-        public JoinCallController(Bot bot, StatefulServiceContext statefulServiceContext, BotOptions botOptions)
+        public JoinCallController(Bot bot, StatelessServiceContext statelessServiceContext, BotOptions botOptions)
         {
             this.bot = bot;
-            this.statefulServiceContext = statefulServiceContext;
+            this.statelessServiceContext = statelessServiceContext;
             this.botOptions = botOptions;
         }
 
@@ -48,7 +48,7 @@ public async Task<IActionResult> JoinCallAsync([FromBody] JoinCallBody joinCallB
             var call = await this.bot.JoinCallAsync(joinCallBody).ConfigureAwait(false);
 
             var serviceURL = new UriBuilder($"{this.Request.Scheme}://{this.Request.Host}");
-            serviceURL.Port = this.botOptions.BotBaseUrl.Port + this.statefulServiceContext.NodeInstance();
+            serviceURL.Port = this.botOptions.BotBaseUrl.Port + this.statelessServiceContext.NodeInstance();
 
             return this.Ok(new JoinCallResponseBody
             {

diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/HueBot.cs b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/HueBot.cs
@@ -24,7 +24,7 @@ namespace HueBot
     /// <summary>
     /// The FabricRuntime creates an instance of this class for each service type instance.
     /// </summary>
-    internal sealed class HueBot : StatefulService
+    internal sealed class HueBot : StatelessService
     {
         private IGraphLogger logger;
         private SampleObserver observer;
@@ -35,10 +35,10 @@ internal sealed class HueBot : StatefulService
         /// <summary>
         /// Initializes a new instance of the <see cref="HueBot" /> class.
         /// </summary>
-        /// <param name="context">Stateful service context from service fabric.</param>
+        /// <param name="context">Stateless service context from service fabric.</param>
         /// <param name="logger">Global logger instance.</param>
         /// <param name="observer">Global observer instance.</param>
-        public HueBot(StatefulServiceContext context, IGraphLogger logger, SampleObserver observer)
+        public HueBot(StatelessServiceContext context, IGraphLogger logger, SampleObserver observer)
             : base(context)
         {
             this.logger = logger;
@@ -54,7 +54,7 @@ public HueBot(StatefulServiceContext context, IGraphLogger logger, SampleObserve
         /// Optional override to create listeners (like tcp, http) for this service instance.
         /// </summary>
         /// <returns>The collection of listeners.</returns>
-        protected override IEnumerable<ServiceReplicaListener> CreateServiceReplicaListeners()
+        protected override IEnumerable<ServiceInstanceListener> CreateServiceInstanceListeners()
         {
             this.configuration = new ConfigurationBuilder()
                 .SetBasePath(Directory.GetCurrentDirectory())
@@ -65,10 +65,10 @@ protected override IEnumerable<ServiceReplicaListener> CreateServiceReplicaListe
 
             this.bot = new Bot(this.botOptions, this.logger, this.Context);
 
-            var serviceReplicaListeners = new List<ServiceReplicaListener>();
+            var serviceInstanceListeners = new List<ServiceInstanceListener>();
             foreach (string endpointName in new[] { "ServiceEndpoint", "SignalingPort", "LocalEndpoint" })
             {
-                serviceReplicaListeners.Add(new ServiceReplicaListener(
+                serviceInstanceListeners.Add(new ServiceInstanceListener(
                     serviceContext =>
                         new HttpSysCommunicationListener(serviceContext, endpointName, (url, listener) =>
                         {
@@ -78,7 +78,7 @@ protected override IEnumerable<ServiceReplicaListener> CreateServiceReplicaListe
                     endpointName));
             }
 
-            return serviceReplicaListeners.ToArray();
+            return serviceInstanceListeners.ToArray();
         }
 
         /// <summary>
@@ -102,7 +102,6 @@ private IWebHost CreateHueBotWebHost(string url)
                     services => services
                         .AddSingleton(this.logger)
                         .AddSingleton(this.observer)
-                        .AddSingleton(this.StateManager)
                         .AddSingleton(this.Context)
                         .AddSingleton(this.botOptions)
                         .AddSingleton(this.bot)

diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/PackageRoot/ServiceManifest.xml b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBot/PackageRoot/ServiceManifest.xml
@@ -7,7 +7,7 @@
   <ServiceTypes>
     <!-- This is the name of your ServiceType.
          This name must match the string used in RegisterServiceType call in Program.cs. -->
-    <StatefulServiceType ServiceTypeName="HueBotType"  HasPersistedState="true" />
+    <StatelessServiceType ServiceTypeName="HueBotType" />
   </ServiceTypes>
 
   <!-- Code package is your service executable. -->

diff --git a/...0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationPackageRoot/ApplicationManifest.xml b/...0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationPackageRoot/ApplicationManifest.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ApplicationManifest xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ApplicationTypeName="HueBotSFType" ApplicationTypeVersion="2.0.0" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <Parameters>
-    <Parameter Name="HueBot_MinReplicaSetSize" DefaultValue="1" />
-    <Parameter Name="HueBot_PartitionCount" DefaultValue="1" />
-    <Parameter Name="HueBot_TargetReplicaSetSize" DefaultValue="1" />
+    <Parameter Name="HueBot_InstanceCount" DefaultValue="-1" />
   </Parameters>
   <!-- Import the ServiceManifest from the ServicePackage. The ServiceManifestName and ServiceManifestVersion 
        should match the Name and Version attributes of the ServiceManifest element defined in the 
@@ -24,9 +22,9 @@
          ServiceFabric PowerShell module.
          The attribute ServiceTypeName below must match the name defined in the imported ServiceManifest.xml file. -->
     <Service Name="HueBot" ServicePackageActivationMode="ExclusiveProcess">
-      <StatefulService ServiceTypeName="HueBotType" TargetReplicaSetSize="[HueBot_TargetReplicaSetSize]" MinReplicaSetSize="[HueBot_MinReplicaSetSize]">
-        <UniformInt64Partition PartitionCount="[HueBot_PartitionCount]" LowKey="1" HighKey="[HueBot_PartitionCount]" />
-      </StatefulService>
+      <StatelessService ServiceTypeName="HueBotType" InstanceCount="[HueBot_InstanceCount]">
+        <SingletonPartition />
+      </StatelessService>
     </Service>
   </DefaultServices>
   <Principals>

diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationParameters/Cloud.xml b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationParameters/Cloud.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="fabric:/HueBotSF" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <Parameters>
-    <Parameter Name="HueBot_PartitionCount" Value="5" />
-    <Parameter Name="HueBot_MinReplicaSetSize" Value="1" />
-    <Parameter Name="HueBot_TargetReplicaSetSize" Value="1" />
+    <Parameter Name="HueBot_InstanceCount" Value="-1" />
   </Parameters>
-</Application>
+</Application>
diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationParameters/Local.1Node.xml b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationParameters/Local.1Node.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="fabric:/HueBotSF" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <Parameters>
-    <Parameter Name="HueBot_PartitionCount" Value="1" />
-    <Parameter Name="HueBot_MinReplicaSetSize" Value="1" />
-    <Parameter Name="HueBot_TargetReplicaSetSize" Value="1" />
+    <Parameter Name="HueBot_InstanceCount" Value="-1" />
   </Parameters>
 </Application>
diff --git a/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationParameters/Local.5Node.xml b/Samples/V1.0Samples/LocalMediaSamples/HueBot/HueBotSF/ApplicationParameters/Local.5Node.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Application xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="fabric:/HueBotSF" xmlns="http://schemas.microsoft.com/2011/01/fabric">
   <Parameters>
-    <Parameter Name="HueBot_PartitionCount" Value="3" />
-    <Parameter Name="HueBot_MinReplicaSetSize" Value="3" />
-    <Parameter Name="HueBot_TargetReplicaSetSize" Value="3" />
+    <Parameter Name="HueBot_InstanceCount" Value="-1" />
   </Parameters>
 </Application>