Merge pull request containerd#10511 from k8s-infra-cherrypick-robot/cherry-pick-10503-to-release/1.6

estesp · web-flow · commit 881a7880b853 · 2024-07-25T21:07:39.000-04:00
[release/1.6] introspection: regenerate UUID if state is empty
diff --git a/services/introspection/local.go b/services/introspection/local.go
@@ -146,6 +146,9 @@ func (l *Local) getUUID() (string, error) {
 		}
 		return "", err
 	}
+	if len(data) == 0 {
+		return l.generateUUID()
+	}
 	u := string(data)
 	if _, err := uuid.Parse(u); err != nil {
 		return "", err

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,9 @@ func (l *Local) getUUID() (string, error) {`
`146`	`146`	`}`
`147`	`147`	`return "", err`
`148`	`148`	`}`
	`149`	`+ if len(data) == 0 {`
	`150`	`+ return l.generateUUID()`
	`151`	`+ }`
`149`	`152`	`u := string(data)`
`150`	`153`	`if _, err := uuid.Parse(u); err != nil {`
`151`	`154`	`return "", err`