fix: fix script path

Author: Okabe-Rintarou-0

controller/src/controller/gpu/controller.go

@@ -28,7 +28,6 @@ type Controller interface {
 type controller struct{}
 
 func (c *controller) dispatchGpuJob(gpuJob *apiObject.GpuJob) {
-	log("received %+v gpu: ", gpuJob)
 	jobFullName := gpuJob.Namespace() + "/" + gpuJob.Name()
 	gpuServerCommands := []string{
 		"./gpu-server",
@@ -109,6 +108,7 @@ func (c *controller) dispatchGpuJob(gpuJob *apiObject.GpuJob) {
 }
 
 func (c *controller) deleteGpuJobPod(gpuJob *apiObject.GpuJob) {
+	log("delete gpu job pod %s/%s", gpuJob.Namespace(), gpuJob.Name())
 	namespace, name := gpuJob.Namespace(), gpuJob.Name()
 	URL := url.Prefix + path.Join(url.PodURL, namespace, name)
 	httputil.DeleteWithoutBody(URL)
@@ -119,6 +119,7 @@ func (c *controller) handleGpuJobUpdate(msg *redis.Message) {
 	if err := json.Unmarshal([]byte(msg.Payload), gpuJobUpdate); err != nil {
 		return
 	}
+	log("received gpu update: %+v", gpuJobUpdate)
 	gpuJob := gpuJobUpdate.Target
 	switch gpuJobUpdate.Action {
 	case entity.CreateAction:

gpu/run/gpu-server

@@ -73,18 +73,22 @@ func (s *server) uploadJobStatus(jobStatus *entity.GpuJobStatus) {
 	client.Publish(ctx, topicutil.GpuJobStatusTopic(), msg)
 }
 
-func (s *server) poll() bool {
-	defer s.recover()
-	fmt.Println("Poll")
-	state, completed := s.cli.JobCompleted(s.jobID)
-	jobName := s.args.JobName
+func parseJobName(jobName string) (namespace, name string) {
 	parts := strings.Split(jobName, "/")
-	var namespace, name string
 	if len(parts) == 2 {
 		namespace, name = parts[0], parts[1]
 	} else {
 		namespace, name = "default", jobName
 	}
+	return
+}
+
+func (s *server) poll() bool {
+	defer s.recover()
+	fmt.Println("Poll")
+	state, completed := s.cli.JobCompleted(s.jobID)
+	jobName := s.args.JobName
+	namespace, name := parseJobName(jobName)
 	status := &entity.GpuJobStatus{
 		Namespace:    namespace,
 		Name:         name,
@@ -127,7 +131,7 @@ func (s *server) uploadSmallFiles(filenames []string) error {
 }
 
 func (s *server) scriptPath() string {
-	return path.Join(s.args.WorkDir, s.args.JobName+"-"+s.uid+".slurm")
+	return path.Join(s.args.WorkDir, s.uid+".slurm")
 }
 
 func (s *server) createJobScript() error {

gpu/src/gpu/server.go

@@ -452,7 +452,7 @@ func getFunctionStatusesFromApiServer() (functions []*entity.FunctionStatus, err
 
 func getGpuJobStatusFromApiServer(fullName string) (gpu *entity.GpuJobStatus, err error) {
 	namespace, name := parseName(fullName)
-	URL := url.Prefix + path.Join(url.GpuURL, namespace, name)
+	URL := url.Prefix + path.Join(url.GpuURL, "status", namespace, name)
 	err = httputil.GetAndUnmarshal(URL, &gpu)
 	return
 }