Skip to content

Commit

Permalink
Merge branch 'main' into mchinta/refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
manasachi authored Jan 16, 2024
2 parents b633c74 + 0be56d2 commit 5fcf5f7
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 2 deletions.
22 changes: 22 additions & 0 deletions cmd/kperf/commands/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,20 @@ package runner

import (
"context"

"encoding/json"
"flag"
"fmt"
"os"
"path/filepath"
"strconv"

"github.com/Azure/kperf/api/types"
"github.com/Azure/kperf/request"

"github.com/urfave/cli"
"gopkg.in/yaml.v2"
"k8s.io/klog/v2"
)

// Command represents runner subcommand.
Expand Down Expand Up @@ -71,9 +75,27 @@ var runCommand = cli.Command{
cli.BoolFlag{
Name: "raw-data",
Usage: "write ResponseStats to file in .json format",
},
cli.StringFlag{
Name: "v",
Usage: "log level for V logs",
Value: "0",
},
},
Action: func(cliCtx *cli.Context) error {
// initialize klog
klog.InitFlags(nil)

vFlag, err := strconv.Atoi(cliCtx.String("v"))
if err != nil || vFlag < 0 {
return fmt.Errorf("invalid value \"%v\" for flag -v: value must be a non-negative integer", cliCtx.String("v"))
}
if err := flag.Set("v", strconv.Itoa(cliCtx.Int("v"))); err != nil {
return fmt.Errorf("failed to set log level: %w", err)
}
defer klog.Flush()
flag.Parse()

profileCfg, err := loadConfig(cliCtx)
if err != nil {
return err
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ require (
k8s.io/apimachinery v0.28.4
k8s.io/cli-runtime v0.28.4
k8s.io/client-go v0.28.4
k8s.io/klog/v2 v2.100.1
k8s.io/kubectl v0.28.4
)

Expand Down Expand Up @@ -135,7 +136,6 @@ require (
k8s.io/apiextensions-apiserver v0.28.4 // indirect
k8s.io/apiserver v0.28.4 // indirect
k8s.io/component-base v0.28.4 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
oras.land/oras-go v1.2.4 // indirect
Expand Down
1 change: 1 addition & 0 deletions manifests/virtualcluster/nodes/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
apiVersion: v1,
"name": "virtualnodes",
"version": "0.0.1"
}
2 changes: 1 addition & 1 deletion manifests/virtualcluster/nodes/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: ""
name: "vc-testing"
controllerNodeSelectors: {}
replicas: 0
nodeLabels: {}
Expand Down
5 changes: 5 additions & 0 deletions request/schedule.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"golang.org/x/time/rate"
"k8s.io/client-go/rest"
"k8s.io/klog/v2"
)

const defaultTimeout = 60 * time.Second
Expand Down Expand Up @@ -55,7 +56,10 @@ func Schedule(ctx context.Context, spec *types.LoadProfileSpec, restCli []rest.I
for builder := range reqBuilderCh {
_, req := builder.Build(cli)

klog.V(9).Infof("Request URL: %s", req.URL())

if err := limiter.Wait(ctx); err != nil {
klog.V(9).Infof("Rate limiter wait failed: %v", err)
cancel()
return
}
Expand All @@ -77,6 +81,7 @@ func Schedule(ctx context.Context, spec *types.LoadProfileSpec, restCli []rest.I

if err != nil {
respMetric.ObserveFailure(err)
klog.V(9).Infof("Request stream failed: %v", err)
}
}()
}
Expand Down

0 comments on commit 5fcf5f7

Please sign in to comment.