From 38e05c48ba672a5ca43ed2d0ef2d5aa28fabcd47 Mon Sep 17 00:00:00 2001
From: Rennbon <343688972@qq.com>
Date: Fri, 11 Mar 2022 19:47:39 +0800
Subject: [PATCH] =?UTF-8?q?refact:=20=E5=BC=BA=E5=88=B6=E5=81=9C=E6=AD=A2?=
 =?UTF-8?q?=E4=B8=8D=E8=AE=B0=E5=BD=95=E5=8E=9F=E5=9B=A0=E5=88=B0extData?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E4=B9=8B=E5=90=8E=E7=9A=84=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E8=80=83=E8=99=91=E5=A6=82=E4=BD=95=E5=8C=BA=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dtmsvr/api.go           | 11 +----------
 dtmsvr/storage/trans.go |  1 -
 dtmsvr/trans_status.go  | 19 ++-----------------
 3 files changed, 3 insertions(+), 28 deletions(-)

diff --git a/dtmsvr/api.go b/dtmsvr/api.go
index fbe7cf9..b2dbefa 100644
--- a/dtmsvr/api.go
+++ b/dtmsvr/api.go
@@ -7,7 +7,6 @@
 package dtmsvr
 
 import (
-	"encoding/json"
 	"fmt"
 
 	"github.com/dtm-labs/dtm/dtmcli"
@@ -64,15 +63,7 @@ func svcForceStop(t *TransGlobal) interface{} {
 	if dbt.Status == dtmcli.StatusSucceed || dbt.Status == dtmcli.StatusFailed {
 		return nil
 	}
-	extData, err := json.Marshal(&ExtData{
-		Type: ExtDataTypeForceStop,
-		Msg:  t.ForceStopReason,
-	})
-	if err != nil {
-		return err
-	}
-	t.ForceStopReason = ""
-	dbt.statusFailed(string(extData))
+	dbt.statusFailed()
 	branches := GetStore().FindBranches(t.Gid)
 	return dbt.Process(branches)
 }
diff --git a/dtmsvr/storage/trans.go b/dtmsvr/storage/trans.go
index 07a06ba..789ba0c 100644
--- a/dtmsvr/storage/trans.go
+++ b/dtmsvr/storage/trans.go
@@ -39,7 +39,6 @@ type TransGlobalStore struct {
 	NextCronTime     *time.Time          `json:"next_cron_time,omitempty"`
 	Owner            string              `json:"owner,omitempty"`
 	Ext              TransGlobalExt      `json:"-" gorm:"-"`
-	ForceStopReason  string              `json:"force_stop_reason,omitempty" gorm:"-"` // only for request
 	ExtData          string              `json:"ext_data,omitempty"`                   // storage of ext. a db field to store many values. like Options
 	dtmcli.TransOptions
 }
diff --git a/dtmsvr/trans_status.go b/dtmsvr/trans_status.go
index 8952d17..876703b 100644
--- a/dtmsvr/trans_status.go
+++ b/dtmsvr/trans_status.go
@@ -58,25 +58,10 @@ func (t *TransGlobal) changeStatus(status string) {
 	t.Status = status
 }
 
-// ExtDataType case extData type
-type ExtDataType string
-
-const (
-	// ExtDataTypeForceStop Type of user forced stop global gid
-	ExtDataTypeForceStop ExtDataType = "forceStop"
-)
-
-// ExtData custom extData struct
-type ExtData struct {
-	Type ExtDataType `json:"type"`
-	Msg  string      `json:"msg"`
-}
-
-func (t *TransGlobal) statusFailed(extData string) {
-	updates := []string{"status", "update_time", "ext_data"}
+func (t *TransGlobal) statusFailed() {
+	updates := []string{"status", "update_time"}
 	now := time.Now()
 	t.UpdateTime = &now
-	t.ExtData = extData
 	GetStore().ChangeGlobalStatus(&t.TransGlobalStore, dtmcli.StatusFailed, updates, false)
 	logger.Infof("StatusFailed to %s ok for %s", dtmcli.StatusFailed, t.TransGlobalStore.String())
 	t.Status = dtmcli.StatusFailed