Log links merging logic should take log link names into account (flyt…

…eorg#32)
eapolinario · Nov 9, 2019 · 333aa78 · 333aa78
1 parent 4cb2859
commit 333aa78
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/flyteadmin/pkg/repositories/transformers/task_execution.go b/flyteadmin/pkg/repositories/transformers/task_execution.go
@@ -137,16 +137,16 @@ func mergeLogs(existing, latest []*core.TaskLog) []*core.TaskLog {
 	if len(existing) == 0 {
 		return latest
 	}
-	existingSet := make(map[string]*core.TaskLog, len(existing))
-	for _, existingLog := range existing {
-		existingSet[existingLog.Uri] = existingLog
-	}
-	// Copy over the existing logs from the input list so we preserve the original order.
-	logs := existing
+	latestSet := make(map[string]*core.TaskLog, len(latest))
 	for _, latestLog := range latest {
-		if _, ok := existingSet[latestLog.Uri]; !ok {
+		latestSet[latestLog.Uri] = latestLog
+	}
+	// Copy over the latest logs since names will change for existing logs as a task transitions across phases.
+	logs := latest
+	for _, existingLog := range existing {
+		if _, ok := latestSet[existingLog.Uri]; !ok {
 			// We haven't seen this log before: add it to the output result list.
-			logs = append(logs, latestLog)
+			logs = append(logs, existingLog)
 		}
 	}
 	return logs

diff --git a/flyteadmin/pkg/repositories/transformers/task_execution_test.go b/flyteadmin/pkg/repositories/transformers/task_execution_test.go
@@ -344,15 +344,15 @@ func TestUpdateTaskExecutionModelRunningToFailed(t *testing.T) {
 			Error: outputError,
 		},
 		Logs: []*core.TaskLog{
-			{
-				Uri: "uri_a",
-			},
 			{
 				Uri: "uri_b",
 			},
 			{
 				Uri: "uri_c",
 			},
+			{
+				Uri: "uri_a",
+			},
 		},
 		CustomInfo: &customInfo,
 	}
@@ -527,7 +527,7 @@ func TestMergeLogs(t *testing.T) {
 				},
 				{
 					Uri:  "uri_b",
-					Name: "name_b",
+					Name: "ignored_name_b",
 				},
 				{
 					Uri:  "uri_c",
@@ -545,22 +545,22 @@ func TestMergeLogs(t *testing.T) {
 				},
 			},
 			expected: []*core.TaskLog{
-				{
-					Uri:  "uri_a",
-					Name: "name_a",
-				},
 				{
 					Uri:  "uri_b",
 					Name: "name_b",
 				},
-				{
-					Uri:  "uri_c",
-					Name: "name_c",
-				},
 				{
 					Uri:  "uri_d",
 					Name: "name_d",
 				},
+				{
+					Uri:  "uri_a",
+					Name: "name_a",
+				},
+				{
+					Uri:  "uri_c",
+					Name: "name_c",
+				},
 			},
 			name: "Merge unique logs",
 		},