fix: init uid/gid in Graph (#1299)

Signed-off-by: Keming <[email protected]> Signed-off-by: Keming <[email protected]>
tensorchord · Dec 13, 2022 · d0a803e · d0a803e
1 parent db0396d
commit d0a803e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pkg/lang/frontend/starlark/v1/config/config.go b/pkg/lang/frontend/starlark/v1/config/config.go
@@ -230,20 +230,18 @@ func ruleFuncRepo(thread *starlark.Thread, _ *starlark.Builtin,
 func ruleFuncOwner(thread *starlark.Thread, _ *starlark.Builtin,
 	args starlark.Tuple, kwargs []starlark.Tuple) (starlark.Value, error) {
 	var (
-		envdUid = starlark.MakeInt(-1)
-		envdGid = starlark.MakeInt(-1)
+		uid = -1
+		gid = -1
 	)
 
-	if err := starlark.UnpackArgs(ruleOwner, args, kwargs, "uid", &envdUid, "gid", &envdGid); err != nil {
+	if err := starlark.UnpackArgs(ruleOwner, args, kwargs, "uid", &uid, "gid", &gid); err != nil {
 		return nil, err
 	}
-	uid, _ := envdUid.Int64()
-	gid, _ := envdGid.Int64()
+
 	if uid < 0 || uid > 65535 || gid < 0 || gid > 65535 {
-		err := errors.New("get a wrong uid or gid")
-		return nil, err
+		return nil, errors.New("get a wrong uid or gid")
 	}
 	logger.Debugf("owner info: uid=%d, gid=%d", uid, gid)
-	ir.Owner(int(uid), int(gid))
+	ir.Owner(uid, gid)
 	return starlark.None, nil
 }
diff --git a/pkg/lang/ir/v1/compile.go b/pkg/lang/ir/v1/compile.go
@@ -43,6 +43,8 @@ func NewGraph() ir.Graph {
 		RuntimeEnviron:  make(map[string]string),
 	}
 	return &generalGraph{
+		uid:      -1,
+		gid:      -1,
 		Image:    defaultImage,
 		Language: ir.Language{},
 		CUDA:     nil,

diff --git a/pkg/lang/ir/v1/util.go b/pkg/lang/ir/v1/util.go
@@ -92,7 +92,7 @@ func (g generalGraph) getUIDGID() (int, int, error) {
 		return uid, gid, nil
 	}
 	if g.uid != -1 && g.gid != -1 {
-		return g.gid, g.gid, nil
+		return g.uid, g.gid, nil
 	}
 	user, err := user.Current()
 	if err != nil {