etl: add object-timeout argument to etl init CLI command (follow-up)

Nahemah1022 · Nahemah1022 · commit 4ef854bde83a · 2025-05-14T13:51:58.000-07:00
* replace the previous `tiemout` arg with `init-timeout` to separate.
* update Python SDK example.

Signed-off-by: Tony Chen &lt;a122774007@gmail.com&gt;
diff --git a/cmd/cli/cli/const.go b/cmd/cli/cli/const.go
@@ -769,7 +769,7 @@ var (
 			indent4 + "\tvalid time units: " + timeUnits,
 	}
 	waitPodReadyTimeoutFlag = DurationFlag{
-		Name: waitJobXactFinishedFlag.Name,
+		Name: "init-timeout",
 		Usage: "AIS target waiting time for POD to become ready;\n" +
 			indent4 + "\tvalid time units: " + timeUnits,
 	}
@@ -1106,9 +1106,9 @@ var (
 		Usage:    "unique ETL name (leaving this field empty will have unique ID auto-generated)",
 		Required: true,
 	}
-	etlBucketRequestTimeout = DurationFlag{
-		Name: "etl-timeout",
-		Usage: "Server-side timeout transforming a single object;\n" +
+	etlObjectRequestTimeout = DurationFlag{
+		Name: "object-timeout",
+		Usage: "Server-side timeout of transforming a single object;\n" +
 			indent4 + "\tvalid time units: " + timeUnits,
 	}
 	etlTransformArgsFlag = cli.StringFlag{
diff --git a/cmd/cli/cli/etl.go b/cmd/cli/cli/etl.go
@@ -36,13 +36,15 @@ var (
 			argTypeFlag,
 			chunkSizeFlag,
 			waitPodReadyTimeoutFlag,
+			etlObjectRequestTimeout,
 			etlNameFlag,
 		},
 		cmdSpec: {
 			fromFileFlag,
 			commTypeFlag,
 			argTypeFlag,
 			waitPodReadyTimeoutFlag,
+			etlObjectRequestTimeout,
 			etlNameFlag,
 		},
 		cmdStop: {
@@ -58,7 +60,6 @@ var (
 			forceFlag,
 			copyPrependFlag,
 			copyDryRunFlag,
-			etlBucketRequestTimeout,
 			listFlag,
 			templateFlag,
 			numWorkersFlag,
@@ -222,7 +223,8 @@ func etlInitSpecHandler(c *cli.Context) error {
 		msg.EtlName = parseStrFlag(c, etlNameFlag)
 		msg.CommTypeX = parseStrFlag(c, commTypeFlag)
 		msg.ArgTypeX = parseStrFlag(c, argTypeFlag)
-		msg.Timeout = cos.Duration(parseDurationFlag(c, waitPodReadyTimeoutFlag))
+		msg.InitTimeout = cos.Duration(parseDurationFlag(c, waitPodReadyTimeoutFlag))
+		msg.ObjTimeout = cos.Duration(parseDurationFlag(c, etlObjectRequestTimeout))
 		msg.Spec = spec
 	}
 
@@ -292,7 +294,8 @@ func etlInitCodeHandler(c *cli.Context) (err error) {
 		}
 	}
 
-	msg.Timeout = cos.Duration(parseDurationFlag(c, waitPodReadyTimeoutFlag))
+	msg.InitTimeout = cos.Duration(parseDurationFlag(c, waitPodReadyTimeoutFlag))
+	msg.ObjTimeout = cos.Duration(parseDurationFlag(c, etlObjectRequestTimeout))
 
 	// funcs
 	msg.Funcs.Transform = parseStrFlag(c, funcTransformFlag)
diff --git a/cmd/cli/cli/multiobj.go b/cmd/cli/cli/multiobj.go
@@ -73,8 +73,8 @@ func runTCO(c *cli.Context, bckFrom, bckTo cmn.Bck, listObjs, tmplObjs, etlName
 	{
 		msg.ListRange = lrMsg
 		msg.DryRun = flagIsSet(c, copyDryRunFlag)
-		if flagIsSet(c, etlBucketRequestTimeout) {
-			msg.Timeout = cos.Duration(etlBucketRequestTimeout.Value)
+		if flagIsSet(c, etlObjectRequestTimeout) {
+			msg.Timeout = cos.Duration(etlObjectRequestTimeout.Value)
 		}
 		msg.LatestVer = flagIsSet(c, latestVerFlag)
 		msg.Sync = flagIsSet(c, syncFlag)
diff --git a/cmd/cli/go.mod b/cmd/cli/go.mod
@@ -3,7 +3,7 @@ module github.com/NVIDIA/aistore/cmd/cli
 go 1.24
 
 require (
-	github.com/NVIDIA/aistore v1.3.28
+	github.com/NVIDIA/aistore v1.3.29-0.20250514160251-25513e7c047f
 	github.com/fatih/color v1.18.0
 	github.com/json-iterator/go v1.1.12
 	github.com/onsi/ginkgo/v2 v2.23.4
diff --git a/cmd/cli/go.sum b/cmd/cli/go.sum
@@ -1,6 +1,6 @@
 github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/NVIDIA/aistore v1.3.28 h1:k6PP+cuavcmlURKXIidfb3lxchohlusdSV1IlZ8qxlo=
-github.com/NVIDIA/aistore v1.3.28/go.mod h1:fG/SUrxDWPoTTZALVMdPMAdY56sar3aiRZVUI+hn++4=
+github.com/NVIDIA/aistore v1.3.29-0.20250514160251-25513e7c047f h1:Ol/6MDgtslTk7YppDUKnGM6UR7FcrS3Btr/21fPfaxE=
+github.com/NVIDIA/aistore v1.3.29-0.20250514160251-25513e7c047f/go.mod h1:fG/SUrxDWPoTTZALVMdPMAdY56sar3aiRZVUI+hn++4=
 github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
 github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
 github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
diff --git a/python/examples/ais-etl/etl_torchvision_hpush.py b/python/examples/ais-etl/etl_torchvision_hpush.py
@@ -36,7 +36,7 @@ def apply_image_transforms(reader, writer):
 client.etl("etl-torchvision").init_code(
     transform=apply_image_transforms,
     dependencies=["Pillow", "torchvision"],
-    timeout="10m",
+    init_timeout="10m",
 )
 
 # Transform bucket with given ETL name

Original file line number	Diff line number	Diff line change
`@@ -769,7 +769,7 @@ var (`
`769`	`769`	`indent4 + "\tvalid time units: " + timeUnits,`
`770`	`770`	`}`
`771`	`771`	`waitPodReadyTimeoutFlag = DurationFlag{`
`772`		`- Name: waitJobXactFinishedFlag.Name,`
	`772`	`+ Name: "init-timeout",`
`773`	`773`	`Usage: "AIS target waiting time for POD to become ready;\n" +`
`774`	`774`	`indent4 + "\tvalid time units: " + timeUnits,`
`775`	`775`	`}`
`@@ -1106,9 +1106,9 @@ var (`
`1106`	`1106`	`Usage: "unique ETL name (leaving this field empty will have unique ID auto-generated)",`
`1107`	`1107`	`Required: true,`
`1108`	`1108`	`}`
`1109`		`- etlBucketRequestTimeout = DurationFlag{`
`1110`		`- Name: "etl-timeout",`
`1111`		`- Usage: "Server-side timeout transforming a single object;\n" +`
	`1109`	`+ etlObjectRequestTimeout = DurationFlag{`
	`1110`	`+ Name: "object-timeout",`
	`1111`	`+ Usage: "Server-side timeout of transforming a single object;\n" +`
`1112`	`1112`	`indent4 + "\tvalid time units: " + timeUnits,`
`1113`	`1113`	`}`
`1114`	`1114`	`etlTransformArgsFlag = cli.StringFlag{`
Original file line number	Diff line number	Diff line change
`@@ -73,8 +73,8 @@ func runTCO(c *cli.Context, bckFrom, bckTo cmn.Bck, listObjs, tmplObjs, etlName`
`73`	`73`	`{`
`74`	`74`	`msg.ListRange = lrMsg`
`75`	`75`	`msg.DryRun = flagIsSet(c, copyDryRunFlag)`
`76`		`- if flagIsSet(c, etlBucketRequestTimeout) {`
`77`		`- msg.Timeout = cos.Duration(etlBucketRequestTimeout.Value)`
	`76`	`+ if flagIsSet(c, etlObjectRequestTimeout) {`
	`77`	`+ msg.Timeout = cos.Duration(etlObjectRequestTimeout.Value)`
`78`	`78`	`}`
`79`	`79`	`msg.LatestVer = flagIsSet(c, latestVerFlag)`
`80`	`80`	`msg.Sync = flagIsSet(c, syncFlag)`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ def apply_image_transforms(reader, writer):`
`36`	`36`	`client.etl("etl-torchvision").init_code(`
`37`	`37`	`transform=apply_image_transforms,`
`38`	`38`	`dependencies=["Pillow", "torchvision"],`
`39`		`- timeout="10m",`
	`39`	`+ init_timeout="10m",`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`# Transform bucket with given ETL name`