Skip to content

Commit 05d9588

Browse files
sgagnieresgagniere
authored
Revert local changes (#3081)
1 parent 569b4df commit 05d9588

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+395
-286
lines changed

‎cmd/docs/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func createTemporaryConfluentHome() (string, error) {
114114
return "", err
115115
}
116116

117-
path := filepath.Join(dir, "share/java/confluent-rebalancer/confluent-rebalancer-0.0.0.jar")
117+
path := filepath.Join(dir, "share/java/confluent-control-center/control-center-0.0.0.jar")
118118

119119
if err := os.MkdirAll(filepath.Dir(path), 0777); err != nil {
120120
return "", err

‎cmd/lint/main.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ var properNouns = []string{
169169
"Key Encryption Key",
170170
"KEK",
171171
"Kotlin",
172-
"KRaft Controller",
173172
"Ktor",
174173
"Kubernetes",
175174
"Node.js",
@@ -259,7 +258,6 @@ var vocabWords = []string{
259258
"keychain",
260259
"kms",
261260
"kotlin",
262-
"kraft",
263261
"ksql",
264262
"ksqldb",
265263
"ktor",

‎internal/local/command_service.go‎

Lines changed: 14 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,10 @@ import (
1717
"golang.org/x/text/cases"
1818
"golang.org/x/text/language"
1919

20-
"github.com/confluentinc/properties"
21-
2220
"github.com/confluentinc/cli/v4/pkg/cmd"
2321
"github.com/confluentinc/cli/v4/pkg/errors"
2422
"github.com/confluentinc/cli/v4/pkg/output"
2523
"github.com/confluentinc/cli/v4/pkg/spinner"
26-
"github.com/confluentinc/cli/v4/pkg/utils"
2724
)
2825

2926
func NewServiceCommand(service string, prerunner cmd.PreRunner) *cobra.Command {
@@ -34,6 +31,8 @@ func NewServiceCommand(service string, prerunner cmd.PreRunner) *cobra.Command {
3431
}
3532

3633
switch service {
34+
case "zookeeper":
35+
cmd.Aliases = []string{"zk"}
3736
case "schema-registry":
3837
cmd.Aliases = []string{"sr"}
3938
}
@@ -253,7 +252,7 @@ func (c *command) runServiceVersionCommand(cmd *cobra.Command, _ []string) error
253252
}
254253

255254
func (c *command) startService(service, configFile string) error {
256-
if err := c.checkJavaVersion(); err != nil {
255+
if err := c.checkJavaVersion(service); err != nil {
257256
return err
258257
}
259258

@@ -371,11 +370,6 @@ func (c *command) startProcess(service string) error {
371370
return err
372371
}
373372

374-
err = c.setupMetaProperties(service)
375-
if err != nil {
376-
return err
377-
}
378-
379373
start := exec.Command(scriptFile, configFile)
380374

381375
logFile, err := c.cc.GetLogFile(service)
@@ -681,7 +675,7 @@ func (c *command) checkOSVersion() error {
681675
return nil
682676
}
683677

684-
func (c *command) checkJavaVersion() error {
678+
func (c *command) checkJavaVersion(service string) error {
685679
java := filepath.Join(os.Getenv("JAVA_HOME"), "/bin/java")
686680
if os.Getenv("JAVA_HOME") == "" {
687681
out, err := exec.Command("which", "java").Output()
@@ -702,7 +696,7 @@ func (c *command) checkJavaVersion() error {
702696
re := regexp.MustCompile(`.+ version "([\d._]+)"`)
703697
javaVersion := string(re.FindSubmatch(data)[1])
704698

705-
isValid, err := isValidJavaVersion(javaVersion)
699+
isValid, err := isValidJavaVersion(service, javaVersion)
706700
if err != nil {
707701
return err
708702
}
@@ -715,7 +709,7 @@ func (c *command) checkJavaVersion() error {
715709
return nil
716710
}
717711

718-
func isValidJavaVersion(javaVersion string) (bool, error) {
712+
func isValidJavaVersion(service, javaVersion string) (bool, error) {
719713
// 1.8.0_152 -> 8.0_152 -> 8.0
720714
javaVersion = strings.TrimPrefix(javaVersion, "1.")
721715
javaVersion = strings.Split(javaVersion, "_")[0]
@@ -732,13 +726,19 @@ func isValidJavaVersion(javaVersion string) (bool, error) {
732726
return false, nil
733727
}
734728

729+
if service == "zookeeper" || service == "kafka" {
730+
return true, nil
731+
}
732+
735733
return true, nil
736734
}
737735

738736
func writeOfficialServiceName(service string) string {
739737
switch service {
740738
case "kafka":
741739
return "Apache Kafka®"
740+
case "zookeeper":
741+
return "Apache ZooKeeper™"
742742
default:
743743
return writeServiceName(service)
744744
}
@@ -750,69 +750,10 @@ func writeServiceName(service string) string {
750750
return "Kafka REST"
751751
case "ksql-server":
752752
return "ksqlDB Server"
753-
case "kraft-controller":
754-
return "KRaft Controller"
753+
case "zookeeper":
754+
return "ZooKeeper"
755755
default:
756756
service = strings.ReplaceAll(service, "-", " ")
757757
return cases.Title(language.Und).String(service)
758758
}
759759
}
760-
761-
func (c *command) setupMetaProperties(service string) error {
762-
if service != "kraft-controller" && service != "kafka" {
763-
return nil
764-
}
765-
766-
dataDir, err := c.cc.GetDataDir(service)
767-
if err != nil {
768-
return err
769-
}
770-
var metaFile string
771-
switch service {
772-
case "kraft-controller":
773-
metaFile = filepath.Join(dataDir, "kraft-controller-logs", "meta.properties")
774-
case "kafka":
775-
metaFile = filepath.Join(dataDir, "kraft-broker-logs", "meta.properties")
776-
}
777-
if utils.FileExists(metaFile) { // formatting the properties file twice results in an error
778-
return nil
779-
}
780-
781-
kafkaStorage, err := c.ch.GetFile("bin", "kafka-storage")
782-
if err != nil {
783-
return err
784-
}
785-
786-
var uuid string
787-
var ok bool
788-
if service == "kraft-controller" {
789-
out, err := exec.Command(kafkaStorage, "random-uuid").Output()
790-
if err != nil {
791-
return err
792-
}
793-
uuid = strings.TrimSuffix(string(out), "\n")
794-
} else if service == "kafka" {
795-
// read the uuid from the controller meta.properties file since the broker needs to use the same id
796-
// this file should exist since the controller is a dependency of the broker, and hence started first
797-
controllerDataDir, err := c.cc.GetDataDir("kraft-controller")
798-
if err != nil {
799-
return err
800-
}
801-
controllerMetaFile := filepath.Join(controllerDataDir, "kraft-controller-logs", "meta.properties")
802-
controllerMetaProperties, err := properties.LoadFile(controllerMetaFile, properties.UTF8)
803-
if err != nil {
804-
return err
805-
}
806-
uuid, ok = controllerMetaProperties.Get("cluster.id")
807-
if !ok {
808-
return errors.New("unable to retrieve cluster id from KRaft controller meta.properties file")
809-
}
810-
}
811-
812-
configFile, err := c.cc.GetConfigFile(service)
813-
if err != nil {
814-
return err
815-
}
816-
817-
return exec.Command(kafkaStorage, "format", "-t", uuid, "-c", configFile).Run()
818-
}

‎internal/local/command_service_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@ func TestIsValidJavaVersion(t *testing.T) {
6262
var isValid bool
6363
var err error
6464

65-
isValid, err = isValidJavaVersion("1.8.0_152")
65+
isValid, err = isValidJavaVersion("", "1.8.0_152")
6666
req.NoError(err)
6767
req.True(isValid)
6868

69-
isValid, err = isValidJavaVersion("9.0.4")
69+
isValid, err = isValidJavaVersion("", "9.0.4")
7070
req.NoError(err)
7171
req.False(isValid)
7272

73-
isValid, err = isValidJavaVersion("13")
73+
isValid, err = isValidJavaVersion("zookeeper", "13")
7474
req.NoError(err)
7575
req.True(isValid)
7676
}

‎internal/local/command_services.go‎

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"fmt"
55
"os"
66
"os/exec"
7-
"path/filepath"
87
"runtime"
98
"slices"
109
"sort"
@@ -31,7 +30,7 @@ var (
3130
services = map[string]*Service{
3231
"connect": {
3332
startDependencies: []string{
34-
"kraft-controller",
33+
"zookeeper",
3534
"kafka",
3635
"schema-registry",
3736
},
@@ -40,9 +39,9 @@ var (
4039
isConfluentPlatformOnly: false,
4140
envPrefix: "CONNECT",
4241
},
43-
/*"control-center": {
42+
"control-center": {
4443
startDependencies: []string{
45-
"kraft-controller",
44+
"zookeeper",
4645
"kafka",
4746
"schema-registry",
4847
"connect",
@@ -52,13 +51,13 @@ var (
5251
port: 9021,
5352
isConfluentPlatformOnly: true,
5453
envPrefix: "CONTROL_CENTER",
55-
},*/
54+
},
5655
"kafka": {
5756
startDependencies: []string{
58-
"kraft-controller",
57+
"zookeeper",
5958
},
6059
stopDependencies: []string{
61-
//"control-center",
60+
"control-center",
6261
"ksql-server",
6362
"connect",
6463
"kafka-rest",
@@ -70,7 +69,7 @@ var (
7069
},
7170
"kafka-rest": {
7271
startDependencies: []string{
73-
"kraft-controller",
72+
"zookeeper",
7473
"kafka",
7574
"schema-registry",
7675
},
@@ -81,7 +80,7 @@ var (
8180
},
8281
"ksql-server": {
8382
startDependencies: []string{
84-
"kraft-controller",
83+
"zookeeper",
8584
"kafka",
8685
"schema-registry",
8786
},
@@ -92,38 +91,38 @@ var (
9291
},
9392
"schema-registry": {
9493
startDependencies: []string{
95-
"kraft-controller",
94+
"zookeeper",
9695
"kafka",
9796
},
9897
stopDependencies: []string{},
9998
port: 8081,
10099
isConfluentPlatformOnly: false,
101100
envPrefix: "SCHEMA_REGISTRY",
102101
},
103-
"kraft-controller": {
102+
"zookeeper": {
104103
startDependencies: []string{},
105104
stopDependencies: []string{
106-
//"control-center",
105+
"control-center",
107106
"ksql-server",
108107
"connect",
109108
"kafka-rest",
110109
"schema-registry",
111110
"kafka",
112111
},
113-
port: 9093,
112+
port: 2181,
114113
isConfluentPlatformOnly: false,
115-
envPrefix: "SAVED_KAFKA",
114+
envPrefix: "ZOOKEEPER",
116115
},
117116
}
118117

119118
orderedServices = []string{
120-
"kraft-controller",
119+
"zookeeper",
121120
"kafka",
122121
"schema-registry",
123122
"kafka-rest",
124123
"connect",
125124
"ksql-server",
126-
//"control-center",
125+
"control-center",
127126
}
128127
)
129128

@@ -192,7 +191,7 @@ func NewServicesStartCommand(prerunner cmd.PreRunner) *cobra.Command {
192191
Code: "confluent local services start",
193192
},
194193
examples.Example{
195-
Text: "Start Apache Kafka® and KRaft controller as its dependency:",
194+
Text: "Start Apache Kafka® and ZooKeeper as its dependency:",
196195
Code: "confluent local services kafka start",
197196
},
198197
),
@@ -396,25 +395,24 @@ func (c *command) getConfig(service string) (map[string]string, error) {
396395
}
397396
case "control-center":
398397
config["confluent.controlcenter.data.dir"] = data
399-
case "kraft-controller":
400-
config["log.dirs"] = filepath.Join(data, "kraft-controller-logs")
401-
if isCP {
402-
config["metric.reporters"] = "io.confluent.metrics.reporter.ConfluentMetricsReporter"
403-
config["confluent.metrics.reporter.bootstrap.servers"] = fmt.Sprintf("localhost:%d", services["kafka"].port)
404-
config["confluent.metrics.reporter.topic.replicas"] = "1"
405-
}
406398
case "kafka":
407-
config["log.dirs"] = filepath.Join(data, "kraft-broker-logs")
399+
config["log.dirs"] = data
408400
if isCP {
409401
config["metric.reporters"] = "io.confluent.metrics.reporter.ConfluentMetricsReporter"
410402
config["confluent.metrics.reporter.bootstrap.servers"] = fmt.Sprintf("localhost:%d", services["kafka"].port)
411403
config["confluent.metrics.reporter.topic.replicas"] = "1"
412404
}
413405
case "kafka-rest":
414406
config["schema.registry.url"] = fmt.Sprintf("http://localhost:%d", services["schema-registry"].port)
407+
config["zookeeper.connect"] = fmt.Sprintf("localhost:%d", services["zookeeper"].port)
415408
case "ksql-server":
409+
config["kafkastore.connection.url"] = fmt.Sprintf("localhost:%d", services["zookeeper"].port)
416410
config["ksql.schema.registry.url"] = fmt.Sprintf("http://localhost:%d", services["schema-registry"].port)
417411
config["state.dir"] = data
412+
case "schema-registry":
413+
config["kafkastore.connection.url"] = fmt.Sprintf("localhost:%d", services["zookeeper"].port)
414+
case "zookeeper":
415+
config["dataDir"] = data
418416
}
419417

420418
if isCP && slices.Contains([]string{"connect", "kafka-rest", "ksql-server", "schema-registry"}, service) {

0 commit comments

Comments
 (0)