Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CLI: Use fntimeout to stop terminating of function in middle (#2709)

Browse Source 
* use flag FnExecutionTimeout instead of FnTestTimeout

* use flag FnExecutionTimeout instead of FnTestTimeout

* keep FnTestTimeout and FunctionTimeout both

* code review changes

Signed-off-by: Shubham Bansal <shubhambansaliimtgn@gmail.com>

---------

Signed-off-by: Shubham Bansal <shubhambansaliimtgn@gmail.com>
This commit is contained in:
Shubham Bansal
2023-02-09 13:57:57 +05:30
committed by GitHub
parent e462f9ab71
commit 3c0c96e98e
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/fission-cli/cmd/function/test.go
+23 -6
View File
@@ -50,14 +50,19 @@ func Test(input cli.Input) error {
} }
func (opts *TestSubCommand) do(input cli.Input) error { func (opts *TestSubCommand) do(input cli.Input) error {
fnName := input.String(flagkey.FnName)
_, namespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceFunction) _, namespace, err := opts.GetResourceNamespace(input, flagkey.NamespaceFunction)
if err != nil { if err != nil {
return errors.Wrap(err, "error in testing function ") return errors.Wrap(err, "error in testing function ")
} }
function, err := opts.Client().FissionClientSet.CoreV1().Functions(namespace).Get(input.Context(), fnName, metav1.GetOptions{})
if err != nil {
return errors.Wrap(err, fmt.Sprintf("read function '%s'", fnName))
}
m := &metav1.ObjectMeta{ m := &metav1.ObjectMeta{
Name: input.String(flagkey.FnName), Name: fnName,
Namespace: namespace, Namespace: namespace,
} }
routerURL := os.Getenv("FISSION_ROUTER") routerURL := os.Getenv("FISSION_ROUTER")
@@ -107,14 +112,26 @@ func (opts *TestSubCommand) do(input cli.Input) error {
functionUrl.RawQuery = query.Encode() functionUrl.RawQuery = query.Encode()
} }
var ctx context.Context var (
ctx context.Context
reqTimeout time.Duration
)
testTimeout := input.Duration(flagkey.FnTestTimeout) fnTestTimeout := input.Duration(flagkey.FnTestTimeout)
if testTimeout <= 0*time.Second { fnSpecTimeout := time.Duration(function.Spec.FunctionTimeout)
if input.IsSet(flagkey.FnTestTimeout) && (fnTestTimeout < fnSpecTimeout) {
reqTimeout = fnTestTimeout
console.Warn(fmt.Sprintf("timeout specified is less than functionTimeout %d Overriding value to %d", fnTestTimeout, fnSpecTimeout))
} else {
reqTimeout = fnSpecTimeout
}
if reqTimeout <= 0*time.Second {
ctx = input.Context() ctx = input.Context()
} else { } else {
var closeCtx context.CancelFunc var closeCtx context.CancelFunc
ctx, closeCtx = context.WithTimeout(input.Context(), input.Duration(flagkey.FnTestTimeout)) ctx, closeCtx = context.WithTimeout(input.Context(), reqTimeout*time.Second)
defer closeCtx() defer closeCtx()
} }