diff --git a/src/master/testTaskCtrler.py b/src/master/testTaskCtrler.py index 75c5ccf..32f425c 100644 --- a/src/master/testTaskCtrler.py +++ b/src/master/testTaskCtrler.py @@ -10,12 +10,12 @@ def run(): channel = grpc.insecure_channel('localhost:50051') stub = rpc_pb2_grpc.WorkerStub(channel) - comm = rpc_pb2.Command(commandLine="echo \"stestsfdsf\\ntewtgsdgfdsgret\newarsafsda\" > /root/nfs/test-for-docklet/test.txt;ls /root/nfs/test-for-docklet", packagePath="/root", envVars={'test1':'10','test2':'20'}) # | awk '{print \"test\\\"\\n\"}' - paras = rpc_pb2.Parameters(command=comm, stderrRedirectPath="/root/nfs/", stdoutRedirectPath="/root/nfs/test-for-docklet") + comm = rpc_pb2.Command(commandLine="echo \"stestsfdsf\\ntewtgsdgfdsgret\newarsafsda\" > /root/oss/test-for-docklet/test.txt;ls /root/oss/test-for-docklet", packagePath="/root", envVars={'test1':'10','test2':'20'}) # | awk '{print \"test\\\"\\n\"}' + paras = rpc_pb2.Parameters(command=comm, stderrRedirectPath="/root/nfs/", stdoutRedirectPath="/root/oss/test-for-docklet") img = rpc_pb2.Image(name="base", type=rpc_pb2.Image.BASE, owner="docklet") inst = rpc_pb2.Instance(cpu=2, memory=2000, disk=500, gpu=0) - mnt = rpc_pb2.Mount(localPath="",remotePath="test-for-docklet",endpoint="oss-cn-beijing.aliyuncs.com",accessKey="LTAIdl7gmmIhfqA9",secretKey="") + mnt = rpc_pb2.Mount(localPath="",provider='aliyun',remotePath="test-for-docklet",other="oss-cn-beijing.aliyuncs.com",accessKey="LTAIdl7gmmIhfqA9",secretKey="") clu = rpc_pb2.Cluster(image=img, instance=inst, mount=[mnt]) task = rpc_pb2.TaskInfo(id="test",username="root",instanceid=1,instanceCount=1,maxRetryCount=1,parameters=paras,cluster=clu,timeout=5,token="test") diff --git a/src/worker/taskcontroller.py b/src/worker/taskcontroller.py index b5a79aa..155558c 100755 --- a/src/worker/taskcontroller.py +++ b/src/worker/taskcontroller.py @@ -215,8 +215,8 @@ class TaskController(rpc_pb2_grpc.WorkerServicer): conffile.write(conftext) #mount oss - self.mount_oss("%s/global/users/%s/data" % (self.fspath,username), mount_list) - mount_str = "lxc.mount.entry = %s/global/users/%s/data/%s %s/root/nfs/%s none bind,rw,create=dir 0 0" + self.mount_oss("%s/global/users/%s/oss" % (self.fspath,username), mount_list) + mount_str = "lxc.mount.entry = %s/global/users/%s/oss/%s %s/root/oss/%s none bind,rw,create=dir 0 0" for mount in mount_list: conffile.write("\n"+ mount_str % (self.fspath, username, mount.remotePath, rootfs, mount.remotePath)) conffile.close() @@ -339,7 +339,7 @@ class TaskController(rpc_pb2_grpc.WorkerServicer): self.release_ip(ip) #umount oss - self.umount_oss("%s/global/users/%s/data" % (self.fspath,username), mount_info) + self.umount_oss("%s/global/users/%s/oss" % (self.fspath,username), mount_info) def add_msg(self,taskid,instanceid,status,token,errmsg): self.msgslock.acquire()