PortRegistry V2

.github/workflows/main.yml

@@ -36,11 +36,11 @@ jobs:
       - name: build Docker images
         run: make builddockerlocal
       - name: GameServer API service unit tests
-        run: cd cmd/gameserverapi && GIN_MODE=release go test
+        run: cd cmd/gameserverapi && GIN_MODE=release go test -race
       - name: initcontainer unit tests
-        run: cd cmd/initcontainer && go test
+        run: cd cmd/initcontainer && go test -race
       - name: nodeagent unit tests
-        run: cd cmd/nodeagent && go test
+        run: cd cmd/nodeagent && go test -race
       - name: operator unit tests
         run: IMAGE_NAME_SAMPLE=thundernetes-netcore IMAGE_NAME_INIT_CONTAINER=thundernetes-initcontainer TAG=$(git rev-list HEAD --max-count=1 --abbrev-commit) make -C pkg/operator test
       - name: install kind binaries

cmd/nodeagent/nodeagentmanager_test.go

@@ -122,7 +122,14 @@ var _ = Describe("nodeagent tests", func() {
 			if !ok {
 				return false
 			}
+<<<<<<< HEAD
 			return tempgs.(*GameServerDetails).IsActive && tempgs.(*GameServerDetails).PreviousGameState == GameStateStandingBy
+=======
+			tempgs.(*GameServerDetails).Mutex.RLock()
+			gsd := *tempgs.(*GameServerDetails)
+			tempgs.(*GameServerDetails).Mutex.RUnlock()
+			return gsd.WasActivated && gsd.PreviousGameState == GameStateStandingBy
+>>>>>>> PortRegistry V2
 		}).Should(BeTrue())
 
 		// heartbeat from the game is still StandingBy
@@ -196,7 +203,7 @@ var _ = Describe("nodeagent tests", func() {
 				// update GameServer CR to active
 				gs.Object["status"].(map[string]interface{})["state"] = "Active"
 				gs.Object["status"].(map[string]interface{})["health"] = "Healthy"
-				gs.Object["status"].(map[string]interface{})["sessiocCookie"] = "cookie123"
+				gs.Object["status"].(map[string]interface{})["sessionCookie"] = "cookie123"
 				_, err = dynamicClient.Resource(gameserverGVR).Namespace(testGameServerNamespace).Update(context.Background(), gs, metav1.UpdateOptions{})
 				Expect(err).ToNot(HaveOccurred())
 
@@ -206,7 +213,10 @@ var _ = Describe("nodeagent tests", func() {
 					if !ok {
 						return false
 					}
-					return tempgs.(*GameServerDetails).IsActive && tempgs.(*GameServerDetails).PreviousGameState == GameStateStandingBy
+					tempgs.(*GameServerDetails).Mutex.RLock()
+					gsd := *tempgs.(*GameServerDetails)
+					tempgs.(*GameServerDetails).Mutex.RUnlock()
+					return gsd.IsActive && tempgs.(*GameServerDetails).PreviousGameState == GameStateStandingBy
 				}).Should(BeTrue())
 
 				// heartbeat from the game is still StandingBy

docs/howtos/configureportrange.md

@@ -7,4 +7,4 @@ nav_order: 7
 
 # Configure Thundernetes port range
 
-By default, Thundernetes will allocate ports in the range 10000-12000 to your GameServers. These ports are allocated to the entire set of VMs in the cluster, meaning that the max number of GameServers is 2000. If you need more or just a different port range, you can configure it via changing the `MIN_PORT` and the `MAX_PORT` environment variables in the controller deployment YAML file.
+By default, Thundernetes will allocate ports in the range 10000-12000 to your GameServers. These ports are allocated to the entire set of VMs in the cluster and are open for each and every VM. If you need more or just a different port range, you can configure it via changing the `MIN_PORT` and the `MAX_PORT` environment variables in the controller deployment YAML file. However, do not modify the port range when there game servers running on the cluster, since this will probably corrupt the port registry, especially if the new and the old range are different.

pkg/operator/Makefile

@@ -62,7 +62,7 @@ vet: ## Run go vet against code.
 ENVTEST_ASSETS_DIR=$(shell pwd)/testbin
 .PHONY: test
 test: manifests generate fmt vet envtest ## Run tests.
-	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" THUNDERNETES_SAMPLE_IMAGE=$(IMAGE_NAME_SAMPLE):$(NETCORE_SAMPLE_TAG) THUNDERNETES_INIT_CONTAINER_IMAGE=$(IMAGE_NAME_INIT_CONTAINER):$(IMAGE_TAG) go test ./... -coverprofile cover.out
+	KUBEBUILDER_ASSETS="$(shell $(ENVTEST) use $(ENVTEST_K8S_VERSION) -p path)" THUNDERNETES_SAMPLE_IMAGE=$(IMAGE_NAME_SAMPLE):$(NETCORE_SAMPLE_TAG) THUNDERNETES_INIT_CONTAINER_IMAGE=$(IMAGE_NAME_INIT_CONTAINER):$(IMAGE_TAG) go test -race ./... -v -coverprofile cover.out
 
 ##@ Build
 

pkg/operator/controllers/gameserver_controller.go

@@ -101,7 +101,11 @@ func (r *GameServerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		if containsString(gs.GetFinalizers(), finalizerName) {
 			patch := client.MergeFrom(gs.DeepCopy())
 			// our finalizer is present, so lets handle any external dependency
-			r.unassignPorts(&gs)
+			err := r.unassignPorts(&gs)
+			if err != nil {
+				// we're logging the error but no more actions
+				log.Error(err, "unable to unassign ports. PortRegistry might be corrupt", "GameServer", gs.Name)
+			}
 			// remove our finalizer from the list and update it.
 			controllerutil.RemoveFinalizer(&gs, finalizerName)
 			if err := r.Patch(ctx, &gs, patch); err != nil {
@@ -223,7 +227,7 @@ func (r *GameServerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 }
 
 // unassignPorts will remove any ports that are used by this GameServer from the port registry
-func (r *GameServerReconciler) unassignPorts(gs *mpsv1alpha1.GameServer) {
+func (r *GameServerReconciler) unassignPorts(gs *mpsv1alpha1.GameServer) error {
 	hostPorts := make([]int32, 0)
 	for i := 0; i < len(gs.Spec.Template.Spec.Containers); i++ {
 		container := gs.Spec.Template.Spec.Containers[i]
@@ -233,7 +237,7 @@ func (r *GameServerReconciler) unassignPorts(gs *mpsv1alpha1.GameServer) {
 			}
 		}
 	}
-	r.PortRegistry.DeregisterServerPorts(hostPorts)
+	return r.PortRegistry.DeregisterServerPorts(hostPorts)
 }
 
 // SetupWithManager sets up the controller with the Manager.