Update Lesson6 branch (#126)

* Update all dependencies to the latest version

* new ticker symbols (#110)

* Add version number (#109)

* Add bash scripts to start/stop k8s services. (#53)

* v0.1.5 release notes (#54)

* Added protobuf installer for bash (#58)

* added price initiator to keep price shards warm w/o entity passivation (#57)

* updated YAML files to use v0.1.6 of Docker images (#59)

* Update build system

* Synchronize with dev branch

README.md

@@ -1,4 +1,6 @@
 # Akka.CQRS
+This code sample is part of Petabridge's [Akka.NET, Akka.Cluster, Kubernetes, and Docker Workshop](https://petabridge.com/cluster/) - if you'd like to follow along with the exercises, please go there!
+
 Akka.CQRS is a reference architecture for [Akka.NET](https://getakka.net/), intended to illustrate the following Akka.NET techniques and principles:
 
 1. [Command-Query Responsibility Segregation](https://docs.microsoft.com/en-us/azure/architecture/patterns/cqrs) - the Akka.NET actors who consume write events use distinctly different interfaces from those who consume read events

build.fsx

@@ -47,6 +47,8 @@ Target "Clean" (fun _ ->
     CleanDir outputPerfTests
     CleanDir outputNuGet
     CleanDir "docs/_site"
+    CleanDirs !! "./**/bin"
+    CleanDirs !! "./**/obj"
 )
 
 Target "AssemblyInfo" (fun _ ->
@@ -164,7 +166,7 @@ Target "Protobuf" <| fun _ ->
 
         let result = ExecProcess(fun info -> 
             info.FileName <- protocPath
-            info.WorkingDirectory <- (Path.GetDirectoryName (FullName protocPath))
+            info.WorkingDirectory <- (Path.GetDirectoryName (FullName protocPath):string)
             info.Arguments <- args) (System.TimeSpan.FromMinutes 45.0) (* Reasonably long-running task. *)
         if result <> 0 then failwithf "protoc failed. %s %s" protocPath args
 
@@ -274,6 +276,7 @@ Target "PublishNuget" (fun _ ->
 // Docker images
 //--------------------------------------------------------------------------------  
 Target "PublishCode" (fun _ ->    
+    ActivateFinalTarget "KillCreatedProcesses"
     let projects = !! "src/**/*.Service.csproj" // publish services  and web only
                       ++ "src/**/*.Web.csproj"
 
@@ -284,7 +287,6 @@ Target "PublishCode" (fun _ ->
                     Project = project
                     Configuration = configuration
                     VersionSuffix = overrideVersionSuffix project
-                    AdditionalArgs = ["--no-restore --output bin/Release/netcoreapp2.1/publish"] // would be ideal to change publish dir via MSBuild
                     })
 
     projects |> Seq.iter (runSingleProject)
@@ -305,6 +307,9 @@ Target "BuildDockerImages" (fun _ ->
 
     let remoteRegistryUrl = getBuildParamOrDefault "remoteRegistry" ""
 
+    let composedGetFileNameWithoutExtension (p:string) =
+        System.IO.Path.GetFileNameWithoutExtension p
+
     let buildDockerImage imageName projectPath =
 
         let args = 
@@ -331,13 +336,16 @@ Target "BuildDockerImages" (fun _ ->
                     |> append "."
                     |> toText
 
+        let composedGetDirName (p:string) =
+            System.IO.Path.GetDirectoryName p
+
         ExecProcess(fun info -> 
                 info.FileName <- "docker"
-                info.WorkingDirectory <- Path.GetDirectoryName projectPath
+                info.WorkingDirectory <- composedGetDirName projectPath
                 info.Arguments <- args) (System.TimeSpan.FromMinutes 5.0) (* Reasonably long-running task. *)
 
     let runSingleProject project =
-        let projectName = Path.GetFileNameWithoutExtension project
+        let projectName = composedGetFileNameWithoutExtension project
         let imageName = mapDockerImageName projectName
         let result = match imageName with
                         | None -> 0

build.sh

@@ -91,6 +91,17 @@ if [ ! -f "$FAKE_EXE" ]; then
     exit 1
 fi
 
+###########################################################################
+# INSTALL Protobuf
+###########################################################################
+if [ ! -f "$PROTOBUF_EXE" ]; then
+    mono "$NUGET_EXE" install Google.Protobuf.Tools -ExcludeVersion -Version $PROTOBUF_VERSION -OutputDirectory "$TOOLS_DIR"
+    if [ $? -ne 0 ]; then
+        echo "An error occured while installing Google.Protobuf.Tools."
+        exit 1
+    fi
+fi
+
 ###########################################################################
 # INSTALL DOCFX
 ###########################################################################

deployK8sServices.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# deploys all Kubernetes services
+
+find ./k8s -name "*.yaml" | while read fname; do
+    echo "Deploying $fname"
+    kubectl apply -f "$fname"
+
+    echo "Waiting 10s before start of next deployment."
+    sleep 10  
+done

docker-images.txt

@@ -0,0 +1,4 @@
+akka.cqrs.tradeprocessor
+akka.cqrs.traders
+akka.cqrs.pricing
+akka.cqrs.pricing.web

k8s/mongodb-deploy.yaml

@@ -9,13 +9,16 @@ spec:
   selector:
     app: mongodb
 ---
-apiVersion: apps/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   namespace: akka-cqrs
   name: mongodb
 spec:
   replicas: 1
+  selector:
+      matchLabels:
+        app: mongodb
   template:
     metadata:
       labels:

k8s/pricing-deploy.yaml

@@ -33,7 +33,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: pricing
-        image: akka.cqrs.pricing:0.1.0
+        image: akka.cqrs.pricing:0.1.6
         lifecycle:
           preStop:
             exec:

k8s/pricing-web-deploy.yaml

@@ -51,7 +51,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: pricing-web
-        image: akka.cqrs.pricing.web:0.1.0
+        image: akka.cqrs.pricing.web:0.1.6
         lifecycle:
           preStop:
             exec:
@@ -82,7 +82,7 @@ spec:
           httpGet:
             path: "/"
             port: 80
-          initialDelaySeconds: 5
+          initialDelaySeconds: 30
         ports:
         - containerPort: 16666
           protocol: TCP

k8s/tradeprocessor-deploy.yaml

@@ -33,7 +33,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: trade-processor
-        image: akka.cqrs.tradeprocessor:0.1.0
+        image: akka.cqrs.tradeprocessor:0.1.6
         lifecycle:
           preStop:
             exec:

k8s/traders-deploy.yaml

@@ -33,7 +33,7 @@ spec:
       terminationGracePeriodSeconds: 35
       containers:
       - name: traders
-        image: akka.cqrs.traders:0.1.0
+        image: akka.cqrs.traders:0.1.6
         lifecycle:
           preStop:
             exec:

src/Akka.CQRS.Infrastructure/Akka.CQRS.Infrastructure.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>$(NetStandardVersion)</TargetFramework>
     <Description>Shared, non-domain-specific infrastructure used by various Akka.CQRS services.</Description>
     <Configurations>Debug;Release;Phobos</Configurations>
   </PropertyGroup>
@@ -15,13 +15,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Cluster.Sharding" Version="$(AkkaVersion)-beta*" />
+    <PackageReference Include="Akka.Cluster.Sharding" Version="$(AkkaVersion)" />
     <PackageReference Include="Akka.Persistence.Extras" Version="$(AkkaPersistenceExtrasVersion)" />
     <PackageReference Include="Akka.Bootstrap.Docker" Version="$(AkkaBootstrapVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Phobos'">
-     <!-- Uncomment these to install Phobos binaries -->
+    <!-- Uncomment these to install Phobos binaries -->
     <!--<PackageReference Include="Phobos.Actor.Cluster" Version="$(PhobosVersion)" />
     <PackageReference Include="Phobos.Tracing.Jaeger" Version="$(PhobosTracingVersion)" />
     <PackageReference Include="Phobos.Monitoring.StatsD" Version="$(PhobosMonitoringVersion)" />-->

src/Akka.CQRS.Infrastructure/StockShardMsgRouter.cs

@@ -34,19 +34,7 @@ public override string EntityId(object message)
             {
                 return envelope.Message.StockId;
             }
-
-            switch (message)
-            {
-                case ConfirmableMessage<Ask> a:
-                    return a.Message.StockId;
-                case ConfirmableMessage<Bid> b:
-                    return b.Message.StockId;
-                case ConfirmableMessage<Fill> f:
-                    return f.Message.StockId;
-                case ConfirmableMessage<Match> m:
-                    return m.Message.StockId;
-            }
-
+
             return null;
         }
     }

src/Akka.CQRS.Pricing.Actors/MatchAggregator.cs

@@ -88,9 +88,7 @@ private void Recovers()
         /// Recovery has completed successfully.
         /// </summary>
         protected override void OnReplaySuccess()
-        {
-            _publishPricesTask = Context.System.Scheduler.ScheduleTellRepeatedlyCancelable(TimeSpan.FromSeconds(10),
-                TimeSpan.FromSeconds(10), Self, PublishEvents.Instance, ActorRefs.NoSender);
+        {         
 
             // setup subscription to TradeEventPublisher
             Self.Tell(DoSubscribe.Instance);
@@ -263,6 +261,9 @@ private void Commands()
 
         protected override void PreStart()
         {
+            _publishPricesTask = Context.System.Scheduler.ScheduleTellRepeatedlyCancelable(TimeSpan.FromSeconds(10),
+               TimeSpan.FromSeconds(10), Self, PublishEvents.Instance, ActorRefs.NoSender);
+
             _log.Info("Starting...");
             base.PreStart();
         }

src/Akka.CQRS.Pricing.Cli/Akka.CQRS.Pricing.Cli.csproj

@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\common.props" />
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>$(NetStandardVersion)</TargetFramework>
     <Description>Petabridge.Cmd palettes for accessing the pricing system.</Description>
     <Configurations>Debug;Release;Phobos</Configurations>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Petabridge.Cmd.Host" Version="0.6.1" />
+    <PackageReference Include="Petabridge.Cmd.Host" Version="$(PetabridgeCmdVersion)" />
   </ItemGroup>
 
   <ItemGroup>

src/Akka.CQRS.Pricing.Service/Akka.CQRS.Pricing.Service.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
-    <OutputPath>bin\Release\$(NetCoreVersion)\</OutputPath>
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,10 +17,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.HealthCheck.Persistence" Version="0.2.1" />
-    <PackageReference Include="Akka.Persistence.MongoDb" Version="1.3.12" />
+    <PackageReference Include="Akka.HealthCheck.Persistence" Version="0.3.0" />
+    <PackageReference Include="Akka.Persistence.MongoDb" Version="1.4.5" />
     <PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PetabridgeCmdVersion)" />
-    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)-beta" />
+    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)" />
     <PackageReference Include="Petabridge.Cmd.Remote" Version="$(PetabridgeCmdVersion)" />
   </ItemGroup>
 

src/Akka.CQRS.Pricing.Service/Dockerfile

@@ -7,18 +7,24 @@ ENV CLUSTER_IP ""
 ENV CLUSTER_PORT "6055"
 ENV MONGO_CONNECTION_STR "" #MongoDb connection string for Akka.Persistence
 
-COPY ./bin/Release/netcoreapp2.1/publish/ /app
-
 # 9110 - Petabridge.Cmd
 # 6055 - Akka.Cluster
 EXPOSE 9110 6055
 
 # Install Petabridge.Cmd client
 RUN dotnet tool install --global pbm 
 
+COPY ./bin/Release/netcoreapp2.1/publish/ /app
+
+FROM microsoft/dotnet:2.1-runtime AS app
+WORKDIR /app
+
+COPY --from=base /app /app
+
+# copy .NET Core global tool
+COPY --from=base /root/.dotnet /root/.dotnet/
+
 # Needed because https://stackoverflow.com/questions/51977474/install-dotnet-core-tool-dockerfile
 ENV PATH="${PATH}:/root/.dotnet/tools"
 
-# RUN pbm help
-
 CMD ["dotnet", "Akka.CQRS.Pricing.Service.dll"]

src/Akka.CQRS.Pricing.Service/Program.cs

@@ -32,11 +32,15 @@ static int Main(string[] args)
 
             var sharding = ClusterSharding.Get(actorSystem);
 
+
             var shardRegion = sharding.Start("priceAggregator",
                 s => Props.Create(() => new MatchAggregator(s)),
                 ClusterShardingSettings.Create(actorSystem),
                 new StockShardMsgRouter());
 
+            var priceInitiatorActor = actorSystem.ActorOf(ClusterSingletonManager.Props(Props.Create(() => new PriceInitiatorActor(shardRegion)),
+                ClusterSingletonManagerSettings.Create(actorSystem).WithRole("pricing-engine").WithSingletonName("priceInitiator")), "priceInitiator");
+
             var clientHandler =
                 actorSystem.ActorOf(Props.Create(() => new ClientHandlerActor(shardRegion)), "subscriptions");
 

src/Akka.CQRS.Pricing.Web/Akka.CQRS.Pricing.Web.csproj

@@ -5,8 +5,8 @@
     <Configurations>Debug;Release;Phobos</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
-    <OutputPath>bin\Release\$(NetCoreVersion)\</OutputPath>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>

src/Akka.CQRS.Pricing.Web/Controllers/HomeController.cs

@@ -12,6 +12,7 @@ public class HomeController : Controller
     {
         public IActionResult Index()
         {
+            ViewData["AppVersion"] = typeof(HomeController).Assembly.ImageRuntimeVersion;
             return View();
         }
 

src/Akka.CQRS.Pricing.Web/Dockerfile

@@ -13,11 +13,19 @@ EXPOSE 16666
 # Install Petabridge.Cmd client
 RUN dotnet tool install --global pbm 
 
+COPY ./bin/Release/netcoreapp2.1/publish/ /app
+
+FROM mcr.microsoft.com/dotnet/core/aspnet:2.1 AS app
+WORKDIR /app
+
+COPY --from=base /app /app
+
+# copy .NET Core global tool
+COPY --from=base /root/.dotnet /root/.dotnet/
+
 # Needed because https://stackoverflow.com/questions/51977474/install-dotnet-core-tool-dockerfile
 ENV PATH="${PATH}:/root/.dotnet/tools"
 
 # RUN pbm help
 
-COPY ./bin/Release/netcoreapp2.1/publish/ /app
-
 CMD ["dotnet", "Akka.CQRS.Pricing.Web.dll"]

src/Akka.CQRS.Pricing.Web/Views/Shared/_Layout.cshtml

@@ -44,7 +44,7 @@
         @RenderBody()
         <hr />
         <footer>
-            <p>&copy; 2019 - Akka.CQRS.Pricing.Web</p>
+            <p>&copy; 2019 - @DateTime.UtcNow.Year Akka.CQRS.Pricing.Web v @ViewData["AppVersion"]</p>
         </footer>
     </div>
 

src/Akka.CQRS.TradePlacers.Service/Akka.CQRS.TradePlacers.Service.csproj

@@ -6,8 +6,8 @@
     <Configurations>Debug;Release;Phobos</Configurations>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
-    <OutputPath>bin\Release\$(NetCoreVersion)\</OutputPath>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Phobos|AnyCPU'">
+    <OutputPath>bin\Release\</OutputPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="Petabridge.Cmd.Cluster" Version="$(PetabridgeCmdVersion)" />
-    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)-beta" />
+    <PackageReference Include="Petabridge.Cmd.Cluster.Sharding" Version="$(PetabridgeCmdVersion)" />
     <PackageReference Include="Petabridge.Cmd.Remote" Version="$(PetabridgeCmdVersion)" />
   </ItemGroup>