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

[STRMCMP-610] Fix flink config rendering #75

Merged
merged 2 commits into from
Aug 19, 2019
Merged

[STRMCMP-610] Fix flink config rendering #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d8c9f8
Fix flink config rendering
Aug 15, 2019
c92284b
fix lint
Aug 15, 2019
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
35 changes: 30 additions & 5 deletions pkg/controller/flink/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package flink

import (
"fmt"
"sort"
"strings"

"github.com/lyft/flinkk8soperator/pkg/apis/app/v1beta1"
"gopkg.in/yaml.v2"
)

const (
Expand Down Expand Up @@ -115,11 +116,35 @@ func renderFlinkConfig(app *v1beta1.FlinkApplication) (string, error) {
(*config)["jobmanager.heap.size"] = getJobManagerHeapMemory(app)
(*config)["taskmanager.heap.size"] = getTaskManagerHeapMemory(app)

b, err := yaml.Marshal(config)
if err != nil {
return "", err
// get the keys for the map
var keys = make([]string, len(*config))
i := 0
for k := range *config {
keys[i] = k
i++
}
return string(b), nil

// sort them to provide a stable iteration order
sort.Strings(keys)

// print them in order
var s strings.Builder
for _, k := range keys {
var vStr string

switch v := (*config)[k].(type) {
case int, uint, int32, uint32, int64, uint64, bool, float32, float64:
vStr = fmt.Sprintf("%v", v)
case string:
vStr = v
default:
return "", fmt.Errorf("invalid type in flink config: %T", v)
}

_, _ = fmt.Fprintf(&s, "%s: %s\n", k, vStr)
}

return s.String(), nil
}

func isHAEnabled(flinkConfig v1beta1.FlinkConfig) bool {
Expand Down
2 changes: 2 additions & 0 deletions pkg/controller/flink/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ func TestRenderFlinkConfigOverrides(t *testing.T) {
"taskmanager.network.memory.fraction": 0.1,
"taskmanager.network.request-backoff.max": 5000,
"jobmanager.rpc.address": "wrong-address",
"env.java.opts.jobmanager": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=39000 -XX:+UseG1GC",
},
TaskManagerConfig: v1beta1.TaskManagerConfig{
TaskSlots: &taskSlots,
Expand All @@ -53,6 +54,7 @@ func TestRenderFlinkConfigOverrides(t *testing.T) {
expected := []string{
"akka.timeout: 5s",
fmt.Sprintf("blob.server.port: %d", blobPort),
"env.java.opts.jobmanager: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=39000 -XX:+UseG1GC",
"jobmanager.heap.size: 1536", // defaults
fmt.Sprintf("jobmanager.rpc.port: %d", RPCDefaultPort),
fmt.Sprintf("jobmanager.web.port: %d", UIDefaultPort),
Expand Down