From 80661eac990a3b8ea101ec1832990607b4277c87 Mon Sep 17 00:00:00 2001 From: ychao_1983 Date: Thu, 10 Aug 2023 11:50:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- services/ai_task_service/cluster/c2net.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/services/ai_task_service/cluster/c2net.go b/services/ai_task_service/cluster/c2net.go index 8bfbd4d406..eb98a3ef6c 100644 --- a/services/ai_task_service/cluster/c2net.go +++ b/services/ai_task_service/cluster/c2net.go @@ -445,20 +445,27 @@ func buildUnzipDatasetCommand(datasets []entity.ContainerData, datasetPath, comp } builder.Next(entity.NewCommand("cd", datasetPath)). Next(entity.NewCommand("echo", "'start to unzip datasets'")) + + fileDatasets := make([]entity.ContainerData, 0) + for _, dataset := range datasets { + if !dataset.IsDir { + fileDatasets = append(fileDatasets, dataset) + } + } //单数据集 - if len(datasets) == 1 { - if strings.HasSuffix(datasets[0].Name, ".tar.gz") { - builder.Next(entity.NewCommand("tar", "--strip-components=1", "-zxvf", "'"+datasets[0].Name+"'")) + if len(fileDatasets) == 1 { + if strings.HasSuffix(fileDatasets[0].Name, ".tar.gz") { + builder.Next(entity.NewCommand("tar", "--strip-components=1", "-zxvf", "'"+fileDatasets[0].Name+"'")) } else { - builder.Next(entity.NewCommand("unzip", "-q", "'"+datasets[0].Name+"'")) + builder.Next(entity.NewCommand("unzip", "-q", "'"+fileDatasets[0].Name+"'")) } builder.Next(entity.NewCommand("ls", "-l")) builder.Next(entity.NewCommand("echo", "'unzip datasets finished'")) return builder } //多数据集 - for i := 0; i < len(datasets); i++ { - name := datasets[i].Name + for i := 0; i < len(fileDatasets); i++ { + name := fileDatasets[i].Name if strings.HasSuffix(name, ".tar.gz") { builder.Next(entity.NewCommand("tar", "-zxvf", name)) } else { -- 2.34.1