From a441b6ebc2d800eeb0fa3b0bee481e018e29d43e Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Thu, 30 Dec 2021 14:50:04 +0800 Subject: [PATCH] try to add brew test --- Formula/dtm.rb | 31 ------------------------------- helper/.goreleaser.yml | 10 ---------- main.go | 4 ++++ qs/main.go | 7 +++---- test/busi/quick_start.go | 2 ++ 5 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 Formula/dtm.rb diff --git a/Formula/dtm.rb b/Formula/dtm.rb deleted file mode 100644 index 19341e9..0000000 --- a/Formula/dtm.rb +++ /dev/null @@ -1,31 +0,0 @@ -# typed: false -# frozen_string_literal: true - -# This file was generated by GoReleaser. DO NOT EDIT. -class Dtm < Formula - desc "A cross-language distributed transaction manager." - homepage "https://d.dtm.pub" - version "1.8.1" - - on_macos do - if Hardware::CPU.intel? - url "https://github.com/dtm-labs/dtm/releases/download/v1.8.1/dtm_1.8.1_darwin_amd64.tar.gz" - sha256 "8277820eac478f48fd6770f41eb2ec674dac1eddc66e4ebbd9c73eb41ae39548" - - def install - bin.install "dtm" - end - end - end - - on_linux do - if Hardware::CPU.intel? - url "https://github.com/dtm-labs/dtm/releases/download/v1.8.1/dtm_1.8.1_linux_amd64.tar.gz" - sha256 "ce83774f50b9f121c5f54baf657555053f817af9efccb50d80a9854b7579807a" - - def install - bin.install "dtm" - end - end - end -end diff --git a/helper/.goreleaser.yml b/helper/.goreleaser.yml index 218bced..daee966 100644 --- a/helper/.goreleaser.yml +++ b/helper/.goreleaser.yml @@ -13,13 +13,3 @@ builds: main: main.go ldflags: - -s -w -X main.Version={{.Version}} -X main.Commit={{.Commit}} -X main.Date={{.Date}} -brews: - - homepage: 'https://d.dtm.pub' - description: 'A cross-language distributed transaction manager.' - folder: Formula - commit_author: - name: dtm-labs - email: 120050102@qq.com - tap: - owner: dtm-labs - name: dtm diff --git a/main.go b/main.go index 4308f4a..ab781c2 100644 --- a/main.go +++ b/main.go @@ -49,6 +49,7 @@ func usage() { var isVersion = flag.Bool("v", false, "Show the version of dtm.") var isDebug = flag.Bool("d", false, "Set log level to debug.") var isHelp = flag.Bool("h", false, "Show the help information about etcd.") +var isReset = flag.Bool("r", false, "Reset dtm server data.") var confFile = flag.String("c", "", "Path to the server configuration file.") func main() { @@ -64,6 +65,9 @@ func main() { if *isDebug { config.Config.LogLevel = "debug" } + if *isReset { + dtmsvr.PopulateDB(false) + } maxprocs.Set(maxprocs.Logger(logger.Infof)) registry.WaitStoreUp() dtmsvr.StartSvr() // 启动dtmsvr的api服务 diff --git a/qs/main.go b/qs/main.go index f31d83a..4cf0586 100644 --- a/qs/main.go +++ b/qs/main.go @@ -7,13 +7,12 @@ package main import ( - "time" - + "github.com/dtm-labs/dtm/dtmcli/logger" "github.com/dtm-labs/dtm/test/busi" ) func main() { busi.QsStartSvr() - busi.QsFireRequest() - time.Sleep(1 * time.Second) + gid := busi.QsFireRequest() + logger.Infof("transaction: %s succeed", gid) } diff --git a/test/busi/quick_start.go b/test/busi/quick_start.go index 3fd9616..8e12cb9 100644 --- a/test/busi/quick_start.go +++ b/test/busi/quick_start.go @@ -40,6 +40,8 @@ func QsFireRequest() string { Add(qsBusi+"/TransOut", qsBusi+"/TransOutCompensate", req). // 添加一个TransIn的子事务,正向操作为url: qsBusi+"/TransOut", 逆向操作为url: qsBusi+"/TransInCompensate" Add(qsBusi+"/TransIn", qsBusi+"/TransInCompensate", req) + // 等待事务全部完成后再返回,可选 + saga.WaitResult = true // 提交saga事务,dtm会完成所有的子事务/回滚所有的子事务 err := saga.Submit() logger.FatalIfError(err)