Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: DiskState parsing error #31

Merged
merged 3 commits into from
May 11, 2023
Merged

fix: DiskState parsing error #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13ed3b4
refactor: add capacity config per broker
chrisgacsal May 10, 2023
ef62908
fix: DiskState type for Kafka Broker Load API
chrisgacsal May 10, 2023
d8386f1
fix: timeout parameters for docker compose
chrisgacsal May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions deploy/cruisecontrol/capacityJBOD.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,45 @@
"NW_OUT": "10000"
},
"doc": "The default capacity for a broker with multiple logDirs each on a separate heterogeneous disk."
},
{
"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."
}
]
}
20 changes: 17 additions & 3 deletions integration_test/kafka_cluster_load_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -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) {
Expand All @@ -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())
Expand All @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions makefile.d/50-deploy.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,4 +28,4 @@ stop: ## Stop local development environment
down \
--remove-orphans \
--volumes \
--timeout $(DOCKER_COMPOSE_TIMEOUT)
-t $(DOCKER_COMPOSE_TIMEOUT)
3 changes: 2 additions & 1 deletion pkg/types/broker_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ type BrokerLoadStats struct {
NetworkOutCapacity float64 `json:"NetworkOutCapacity"`
LeaderNwInRate float64 `json:"LeaderNwInRate"`
DiskPct float64 `json:"DiskPct"`
DiskState []DiskStats `json:"DiskState"`

DiskState map[string]DiskStats `json:"DiskState"`
}

const (
Expand Down