fix: DiskState parsing error (banzaicloud#31)

adobe · Dec 12, 2023 · 1732b6b · 1732b6b
1 parent e170504
commit 1732b6b
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 5 deletions.
diff --git a/deploy/cruisecontrol/capacityJBOD.json b/deploy/cruisecontrol/capacityJBOD.json
@@ -1,5 +1,44 @@
 {
   "brokerCapacities":[
+    {
+      "brokerId": "0",
+      "capacity": {
+        "DISK": {
+          "/var/lib/kafka/data0": "100000",
+          "/var/lib/kafka/data1": "100000"
+        },
+        "CPU": "100",
+        "NW_IN": "10000",
+        "NW_OUT": "10000"
+      },
+      "doc": "The default capacity for a broker with multiple logDirs each on a separate heterogeneous disk."
+    },
+    {
+      "brokerId": "1",
+      "capacity": {
+        "DISK": {
+          "/var/lib/kafka/data0": "100000",
+          "/var/lib/kafka/data1": "100000"
+        },
+        "CPU": "100",
+        "NW_IN": "10000",
+        "NW_OUT": "10000"
+      },
+      "doc": "The default capacity for a broker with multiple logDirs each on a separate heterogeneous disk."
+    },
+    {
+      "brokerId": "2",
+      "capacity": {
+        "DISK": {
+          "/var/lib/kafka/data0": "100000",
+          "/var/lib/kafka/data1": "100000"
+        },
+        "CPU": "100",
+        "NW_IN": "10000",
+        "NW_OUT": "10000"
+      },
+      "doc": "The default capacity for a broker with multiple logDirs each on a separate heterogeneous disk."
+    },
     {
       "brokerId": "0",
       "capacity": {

diff --git a/integration_test/kafka_cluster_load_test.go b/integration_test/kafka_cluster_load_test.go
@@ -17,10 +17,11 @@ limitations under the License.
 package integration_test
 
 import (
-	"github.com/banzaicloud/go-cruise-control/integration_test/helpers"
-	"github.com/banzaicloud/go-cruise-control/pkg/api"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
+	"github.com/banzaicloud/go-cruise-control/integration_test/helpers"
+	"github.com/banzaicloud/go-cruise-control/pkg/api"
 )
 
 var _ = Describe("Kafka Cluster Load", Label("api:load", "api:state"), func() {
@@ -65,6 +66,11 @@ var _ = Describe("Kafka Cluster Load", Label("api:load", "api:state"), func() {
 				"rack-2",
 			},
 		}
+
+		expectedBrokerDisks = []string{
+			"/var/lib/kafka/data0",
+			"/var/lib/kafka/data1",
+		}
 	)
 
 	BeforeEach(func(ctx SpecContext) {
@@ -80,7 +86,10 @@ var _ = Describe("Kafka Cluster Load", Label("api:load", "api:state"), func() {
 		Context("for the last hour", func() {
 			It("should result no errors", func(ctx SpecContext) {
 				By("requesting load information")
-				req := api.KafkaClusterLoadRequestWithDefaults()
+				req := &api.KafkaClusterLoadRequest{
+					AllowCapacityEstimation: true,
+					PopulateDiskInfo:        true,
+				}
 				resp, err := cruisecontrol.KafkaClusterLoad(ctx, req)
 				Expect(err).NotTo(HaveOccurred())
 				Expect(resp.Failed()).To(BeFalse())
@@ -94,6 +103,11 @@ var _ = Describe("Kafka Cluster Load", Label("api:load", "api:state"), func() {
 					Expect(ok).To(BeTrue())
 					Expect(broker.Host).To(Equal(expectedBroker.Host))
 					Expect(broker.Rack).To(Equal(expectedBroker.Rack))
+
+					for _, disk := range expectedBrokerDisks {
+						_, ok := broker.DiskState[disk]
+						Expect(ok).To(BeTrue())
+					}
 				}
 
 				By("getting host load statistics")

diff --git a/makefile.d/50-deploy.mk b/makefile.d/50-deploy.mk
@@ -16,7 +16,7 @@ start: ## Spin up local development environment
 		up \
 		--detach \
 		--remove-orphans \
-		--timeout $(DOCKER_COMPOSE_TIMEOUT) \
+		-t $(DOCKER_COMPOSE_TIMEOUT) \
 		--wait
 
 .PHONY: stop
@@ -28,4 +28,4 @@ stop: ## Stop local development environment
 		down \
 		--remove-orphans \
 		--volumes \
-		--timeout $(DOCKER_COMPOSE_TIMEOUT)
+		-t $(DOCKER_COMPOSE_TIMEOUT)