From 83598c4ab6f3ac710ea6dab683b1e544abb02824 Mon Sep 17 00:00:00 2001
From: Lars Maier <lars@arangodb.com>
Date: Tue, 24 Sep 2019 09:23:13 +0200
Subject: [PATCH] When the member is terminated do not set cleaned out state
 when resigning. Added test for upgrade. (#450)

---
 pkg/deployment/resources/pod_termination.go | 15 ++++++++++-----
 tests/upgrade_test.go                       |  9 +++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkg/deployment/resources/pod_termination.go b/pkg/deployment/resources/pod_termination.go
index 22eddd731..7fd19e1ec 100644
--- a/pkg/deployment/resources/pod_termination.go
+++ b/pkg/deployment/resources/pod_termination.go
@@ -141,8 +141,8 @@ func (r *Resources) prepareDBServerPodTermination(ctx context.Context, log zerol
 	currentVersion := memberStatus.ArangoVersion
 	if currentVersion != "" {
 		if currentVersion.CompareTo("3.4.7") > 0 && currentVersion.CompareTo("3.5") < 0 {
-		  resignJobAvailable = true
-	  } else if currentVersion.CompareTo("3.5.0") > 0 {
+			resignJobAvailable = true
+		} else if currentVersion.CompareTo("3.5.0") > 0 {
 			resignJobAvailable = true
 		}
 	}
@@ -216,11 +216,16 @@ func (r *Resources) prepareDBServerPodTermination(ctx context.Context, log zerol
 		// At this point we have to set CleanedOut to true,
 		// because we can no longer reason about the state in the agency and
 		// bringing back the dbserver again may result in an cleaned out server without us knowing
-		memberStatus.Conditions.Update(api.ConditionTypeCleanedOut, true, "Draining server failed", "")
-		memberStatus.CleanoutJobID = ""
-		if memberStatus.Phase == api.MemberPhaseDrain {
+		if dbserverDataWillBeGone {
+			memberStatus.Conditions.Update(api.ConditionTypeCleanedOut, true, "Draining server failed", "")
+			memberStatus.CleanoutJobID = ""
+			if memberStatus.Phase == api.MemberPhaseDrain {
+				memberStatus.Phase = api.MemberPhaseCreated
+			}
+		} else if memberStatus.Phase == api.MemberPhaseResign {
 			memberStatus.Phase = api.MemberPhaseCreated
 		}
+
 		if err := updateMember(memberStatus); err != nil {
 			return maskAny(err)
 		}
diff --git a/tests/upgrade_test.go b/tests/upgrade_test.go
index 7d38f561d..13aed3902 100644
--- a/tests/upgrade_test.go
+++ b/tests/upgrade_test.go
@@ -109,6 +109,15 @@ func TestUpgradeClusterRocksDB346Cto347C(t *testing.T) {
 	})
 }
 
+func TestUpgradeClusterRocksDB348Eto351E(t *testing.T) {
+	runUpgradeTest(t, &upgradeTest{
+		fromVersion: "3.4.8",
+		toVersion:   "3.5.1",
+		toImage:     "arangodb/enterprise-preview",
+		shortTest:   true,
+	})
+}
+
 type upgradeTest struct {
 	fromVersion string
 	toVersion   string