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.

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

[YUNIKORN-1948] Introduce a command to validate the content of a give… #634

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ pseudo:

# Build the example binaries for dev and test
.PHONY: commands
commands: build/simplescheduler build/schedulerclient
commands: build/simplescheduler build/schedulerclient build/queueconfigchecker

build/simplescheduler: go.mod go.sum cmd
@echo "building example scheduler"
Expand All @@ -189,6 +189,11 @@ build/schedulerclient:
@mkdir -p build
"$(GO)" build $(RACE) -a -ldflags '-extldflags "-static"' -o build/schedulerclient ./cmd/schedulerclient

build/queueconfigchecker:
@echo "building queueconfigchecker"
@mkdir -p build
"$(GO)" build $(RACE) -a -ldflags '-extldflags "-static"' -o build/queueconfigchecker ./cmd/queueconfigchecker

# Build binaries for dev and test
.PHONY: build
build: commands
Expand Down
47 changes: 47 additions & 0 deletions cmd/queueconfigchecker/queueconfigchecker.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
regarding copyright ownership. The ASF licenses this file
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package main

import (
"log"
"os"

"github.com/apache/yunikorn-core/pkg/common/configs"
)

/*
A utility command to load queue configuration file and check its validity
*/
func main() {
if len(os.Args) != 2 {
log.Println("Usage: " + os.Args[0] + " <queue-config-file>")
os.Exit(1)
}
queueFile := os.Args[1]
conf, err := os.ReadFile(queueFile)
if err != nil {
log.Printf("Could not read file: %v", err)
os.Exit(2)
}
_, err = configs.LoadSchedulerConfigFromByteArray(conf)
if err != nil {
log.Printf("Config validation failed: %v", err)
os.Exit(3)
}
}
1 change: 0 additions & 1 deletion pkg/common/configs/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,6 @@ type NodeSortingPolicy struct {
ResourceWeights map[string]float64 `yaml:",omitempty" json:",omitempty"`
}

// Visible by tests
func LoadSchedulerConfigFromByteArray(content []byte) (*SchedulerConfig, error) {
conf, err := ParseAndValidateConfig(content)
if err != nil {
Expand Down