Skip to content

Commit fbbb905

Browse files
Adrian ComanAdrian Coman
authored andcommitted
Added 30s timeout to JMX extractor
1 parent a2fb50e commit fbbb905

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

pkg/jmxextractor/extractor.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"io"
2121
"net/http"
2222
"regexp"
23+
"time"
2324

2425
"github.com/banzaicloud/koperator/api/v1beta1"
2526
"github.com/banzaicloud/koperator/pkg/errorfactory"
@@ -90,7 +91,8 @@ func (exp *jmxExtractor) ExtractDockerImageAndVersion(brokerId int32, brokerConf
9091
requestURL = fmt.Sprintf(serviceJMXTemplate, exp.clusterName, brokerId,
9192
exp.clusterNamespace, exp.kubernetesClusterDomain, 9020)
9293
}
93-
rsp, err := http.Get(requestURL)
94+
client := &http.Client{Timeout: 30 * time.Second}
95+
rsp, err := client.Get(requestURL)
9496
if err != nil {
9597
exp.log.Error(err, fmt.Sprintf("error during talking to broker-%d", brokerId))
9698
return nil, errorfactory.New(errorfactory.BrokersNotReady{}, err, "unable to talk to ...")

pkg/resources/kafka/kafka.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -931,10 +931,8 @@ func (r *Reconciler) updateStatusWithDockerImageAndVersion(brokers map[int32]*ba
931931
ch := make(chan brokerVersionResult, len(brokers))
932932
for brokerID, brokerConfig := range brokers {
933933
go func(id int32, cfg *banzaiv1beta1.BrokerConfig) {
934-
jmxExp := jmxextractor.NewJMXExtractor(r.KafkaCluster.GetNamespace(),
935-
r.KafkaCluster.Spec.GetKubernetesClusterDomain(), r.KafkaCluster.GetName(), log)
936-
kv, err := jmxExp.ExtractDockerImageAndVersion(id, cfg,
937-
r.KafkaCluster.Spec.GetClusterImage(), r.KafkaCluster.Spec.HeadlessServiceEnabled)
934+
jmxExp := jmxextractor.NewJMXExtractor(r.KafkaCluster.GetNamespace(), r.KafkaCluster.Spec.GetKubernetesClusterDomain(), r.KafkaCluster.GetName(), log)
935+
kv, err := jmxExp.ExtractDockerImageAndVersion(id, cfg, r.KafkaCluster.Spec.GetClusterImage(), r.KafkaCluster.Spec.HeadlessServiceEnabled)
938936
if err != nil {
939937
ch <- brokerVersionResult{brokerID: id, err: err}
940938
return

0 commit comments

Comments
 (0)