[Bugfix] Move terminaton log before pod is terminated (#630)

Author: ajanikow

pkg/deployment/resources/pod_inspector.go

@@ -111,6 +111,20 @@ func (r *Resources) InspectPods(ctx context.Context, cachedStatus inspector.Insp
 			// Pod has terminated with at least 1 container with a non-zero exit code.
 			wasTerminated := memberStatus.Conditions.IsTrue(api.ConditionTypeTerminated)
 			if memberStatus.Conditions.Update(api.ConditionTypeTerminated, true, "Pod Failed", "") {
+				if c, ok := k8sutil.GetContainerStatusByName(pod, k8sutil.ServerContainerName); ok {
+					if t := c.State.Terminated; t != nil {
+						log.Warn().Str("member", memberStatus.ID).
+							Str("pod", pod.GetName()).
+							Str("uid", string(pod.GetUID())).
+							Int32("exit-code", t.ExitCode).
+							Str("reason", t.Reason).
+							Str("message", t.Message).
+							Int32("signal", t.Signal).
+							Time("started", t.StartedAt.Time).
+							Time("finished", t.FinishedAt.Time).
+							Msgf("Pod failed in unexpected way")
+					}
+				}
 				log.Debug().Str("pod-name", pod.GetName()).Msg("Updating member condition Terminated to true: Pod Failed")
 				updateMemberStatusNeeded = true
 				nextInterval = nextInterval.ReduceTo(recheckSoonPodInspectorInterval)

pkg/deployment/resources/pod_termination.go

@@ -131,21 +131,6 @@ func (r *Resources) prepareDBServerPodTermination(ctx context.Context, log zerol
 		return nil
 	}
 
-	if c, ok := k8sutil.GetContainerStatusByName(p, k8sutil.ServerContainerName); ok {
-		if t := c.State.Terminated; t != nil {
-			log.Warn().Str("member", memberStatus.ID).
-				Str("pod", p.GetName()).
-				Str("uid", string(p.GetUID())).
-				Int32("exit-code", t.ExitCode).
-				Str("reason", t.Reason).
-				Str("message", t.Message).
-				Int32("signal", t.Signal).
-				Time("started", t.StartedAt.Time).
-				Time("finished", t.FinishedAt.Time).
-				Msgf("Pod failed in unexpected way")
-		}
-	}
-
 	// Inspect deployment deletion state
 	apiObject := r.context.GetAPIObject()
 	if apiObject.GetDeletionTimestamp() != nil {