Fix init command tombstone functionality (#769)

* experimental Signed-off-by: Volkan Özçelik <ovolkan@vmware.com> * debugging tombstone data Signed-off-by: Volkan Özçelik <ovolkan@vmware.com> * fix tombstone Signed-off-by: Volkan Özçelik <ovolkan@vmware.com> * typo fix Signed-off-by: Volkan Özçelik <ovolkan@vmware.com> * manifest update Signed-off-by: Volkan Özçelik <ovolkan@vmware.com> --------- Signed-off-by: Volkan Özçelik <ovolkan@vmware.com>
vmware-tanzu · Apr 1, 2024 · b150113 · b150113
1 parent c40afc1
commit b150113
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/app/sentinel/busywait/initialization/run.go b/app/sentinel/busywait/initialization/run.go
@@ -142,7 +142,7 @@ dance:
  if err != nil {
  log.InfoLn(
  cid,
- "RunInitCommands: no initialization file found... skipping custom initialization.",
+ "RunInitCommands: no tombstone file found... skipping custom initialization.",
  )
  return
  }
@@ -156,10 +156,12 @@ dance:
 
  data, err := os.ReadFile(tombstonePath)
 
- if strings.TrimSpace(string(data)) == "exit" {
+ log.InfoLn(cid, "tombstone data '", string(data), "'")
+
+ if strings.TrimSpace(string(data)) == "complete" {
  log.InfoLn(
  cid,
- "RunInitCommands: Initialization already exit... skipping custom initialization.",
+ "RunInitCommands: Already initialized. Skipping custom initialization.",
  )
  return
  }

diff --git a/core/log/std/envinfo.go b/core/log/std/envinfo.go
@@ -68,7 +68,7 @@ func printFormattedInfo(id *string, info map[string]string) {
 
  for _, key := range infoKeys {
  padding := strings.Repeat(" ", maxLength-len(key))
- fmt.Printf("%s%s%s: %s\n", idp, padding, toCustomCase(key), info[key])
+ fmt.Printf("%s %s%s: %s\n", idp, padding, toCustomCase(key), info[key])
  }
 }