diff --git a/go.mod b/go.mod index 9127c1c7..4571699a 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/apache/dubbo-getty v1.4.7 github.com/creasty/defaults v1.5.2 github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd // indirect - github.com/dubbogo/gost v1.11.16 + github.com/dubbogo/gost v1.11.20 github.com/go-sql-driver/mysql v1.5.0 github.com/go-xorm/xorm v0.7.9 github.com/imdario/mergo v0.3.12 @@ -20,7 +20,7 @@ require ( github.com/stretchr/testify v1.7.0 github.com/urfave/cli/v2 v2.3.0 go.etcd.io/etcd/client/v3 v3.5.0-alpha.0 - go.uber.org/atomic v1.7.0 + go.uber.org/atomic v1.9.0 go.uber.org/zap v1.17.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 @@ -28,10 +28,3 @@ require ( vimagination.zapto.org/memio v0.0.0-20200222190306-588ebc67b97d // indirect xorm.io/builder v0.3.9 ) - -replace ( - github.com/apache/dubbo-getty => github.com/dubbogo/getty v1.4.3 - github.com/coreos/bbolt => go.etcd.io/bbolt v1.3.4 - github.com/pingcap/parser => github.com/pingcap/parser v0.0.0-20200422082501-7329d80eaf2c - go.etcd.io/bbolt => github.com/coreos/bbolt v1.3.4 -) diff --git a/go.sum b/go.sum index 70c0cf5f..c161898d 100644 --- a/go.sum +++ b/go.sum @@ -14,6 +14,8 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:lSA0F4e9A2NcQSqGqTOXqu2aRi/XEQxDCBwM8yJtE6s= gitea.com/xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:EXuID2Zs0pAQhH8yz+DNjUbjppKQzKFAn28TMYPB6IU= +github.com/AlexStocks/goext v0.3.3/go.mod h1:3M5j9Pjge4CdkNg2WIjRLUeoPedJHHKwkkglDGSl3Hc= +github.com/AlexStocks/log4go v1.0.7/go.mod h1:p7vP0/IAoSu7SLjjSvn4NciqYs//Ylyy/FxE0kmqFUg= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= @@ -33,6 +35,8 @@ github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk5 github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFmb7mUnp8nH9fQBA= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/apache/dubbo-getty v1.4.7 h1:DckNY2c9i8FF3xX1w7fWqsgBz108EE4mLpeedwYBuLw= +github.com/apache/dubbo-getty v1.4.7/go.mod h1:+6IHweEgfMCShEzGzQw2H7Wt33nYTJ/U9lNH9tHrzMM= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= @@ -42,7 +46,6 @@ github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6l github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= @@ -73,8 +76,7 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coreos/bbolt v1.3.4 h1:0VqjxUwoTLxM3PmsSIk0hI2ao6gTtButQ2z8FT4//yo= -github.com/coreos/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= @@ -102,12 +104,9 @@ github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd h1:83Wprp6RO github.com/denisenkom/go-mssqldb v0.0.0-20191124224453-732737034ffd/go.mod h1:xbL0rPBG9cCiLr28tMa8zpbdarY27NDyej4t/EjAShU= github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/dubbogo/getty v1.4.3 h1:GK+N1+lyYFIC7tZJ3my2BRWtFDuI/n2ku0IzhdKktTg= -github.com/dubbogo/getty v1.4.3/go.mod h1:ansXgKxxyhCOiQL29nO5ce1MDcEKmCyZuNR9oMs3hek= github.com/dubbogo/go-zookeeper v1.0.3/go.mod h1:fn6n2CAEer3novYgk9ULLwAjuV8/g4DdC2ENwRb6E+c= -github.com/dubbogo/gost v1.10.1/go.mod h1:+mQGS51XQEUWZP2JeGZTxJwipjRKtJO7Tr+FOg+72rI= -github.com/dubbogo/gost v1.11.16 h1:fvOw8aKQ0BuUYuD+MaXAYFvT7tg2l7WAS5SL5gZJpFs= -github.com/dubbogo/gost v1.11.16/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= +github.com/dubbogo/gost v1.11.20 h1:WADtik6Zpl8ExJ/5FG9VuGBebZ7yzDgHbgnjX1v158s= +github.com/dubbogo/gost v1.11.20/go.mod h1:vIcP9rqz2KsXHPjsAwIUtfJIJjppQLQDcYaZTy/61jI= github.com/dubbogo/jsonparser v1.0.1/go.mod h1:tYAtpctvSP/tWw4MeelsowSPgXQRVHHWbqL6ynps8jU= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= @@ -124,12 +123,13 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239 h1:Ghm4eQYC0nEPnSJdVkTrXpu9KtoVCSo1hg7mtI7G9KU= github.com/fastly/go-utils v0.0.0-20180712184237-d95a45783239/go.mod h1:Gdwt2ce0yfBxPvZrHkprdPPTTS3N5rwmLE8T22KBXlw= +github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwoZc+/fpc= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk= github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= -github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/getsentry/raven-go v0.2.0 h1:no+xWJRb5ZI7eE8TWgIq1jLulQiIoLG0IfYxv5JYMGs= github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= @@ -207,7 +207,6 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.1.2 h1:EVhdT+1Kseyi1/pUmXKaFxYsDNy9RQYkMWRH68J/W7Y= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= @@ -252,7 +251,6 @@ github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= @@ -268,18 +266,21 @@ github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10 h1:Kz6Cvnvv2wGdaG/V8yMvfkmNiXq9Ya2KUv4rouJJr68= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/errors v0.0.0-20210818161939-5560c4c073ff/go.mod h1:i1eL7XREII6aHpQ2gApI/v6FkVUDEBremNkcBCKYAcY= +github.com/juju/loggo v0.0.0-20170605014607-8232ab8918d9/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= +github.com/juju/testing v0.0.0-20180517134105-72703b1e95eb/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= @@ -291,6 +292,7 @@ github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQL github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/koding/multiconfig v0.0.0-20171124222453-69c27309b2d7/go.mod h1:Y2SaZf2Rzd0pXkLVhLlCiAXFCLSXAIbTKDivVgff/AM= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -314,15 +316,17 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mailru/easyjson v0.7.1/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.7 h1:bQGKb3vps/j0E9GfJQ03JyhRuxsvdAanXlT9BTw3mdw= github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= -github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v2.0.1+incompatible h1:xQ15muvnzGBHpIpdrNi1DA5x0+TcBZzsIDwmw9uTHzw= github.com/mattn/go-sqlite3 v2.0.1+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= @@ -343,6 +347,7 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/montanaflynn/stats v0.6.6/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nacos-group/nacos-sdk-go v1.0.8 h1:8pEm05Cdav9sQgJSv5kyvlgfz0SzFUUGI3pWX6SiSnM= @@ -433,7 +438,6 @@ github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQD github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shirou/gopsutil v3.20.11-0.20201116082039-2fb5da2f2449+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.20.11+incompatible h1:LJr4ZQK4mPpIV5gOa4jCOKOGb4ty4DZO54I4FGqIpto= github.com/shirou/gopsutil v3.20.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shopspring/decimal v0.0.0-20180709203117-cd690d0c9e24/go.mod h1:M+9NzErvs504Cn4c5DxATwIqPbtswREoFCre64PpcG4= @@ -473,7 +477,6 @@ github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -497,7 +500,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= -go.etcd.io/bbolt v1.3.4/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0-alpha.0 h1:+e5nrluATIy3GP53znpkHMFzPTHGYyzvJGFCbuI6ZLc= @@ -521,8 +527,9 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= +go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -560,9 +567,7 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= @@ -570,7 +575,6 @@ golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKG golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.2.0 h1:KU7oHjnv3XNWfa5COkzUifxZmxp1TyI7ImMXqFxLwvQ= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -592,7 +596,6 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200226121028-0de0cce0169b h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200421231249-e086a090c8fd/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= @@ -634,7 +637,6 @@ golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191220142924-d4481acd189f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -646,8 +648,10 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201214210602-f9fddec55a1e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201223074533-0d417f636930 h1:vRgIt+nup/B/BwIS0g2oC0haq0iqbV3ZA+u6+0TlNCo= golang.org/x/sys v0.0.0-20201223074533-0d417f636930/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1 h1:kwrAHlwJ0DUBZwQ238v+Uod/3eZ8B2K5rYsUHBQvzmI= +golang.org/x/sys v0.0.0-20211117180635-dee7805ff2e1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= @@ -751,6 +755,7 @@ google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20160105164936-4f90aeace3a2/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= @@ -762,11 +767,13 @@ gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno= gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/mgo.v2 v2.0.0-20160818015218-f2b6f6c918c4/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= +gopkg.in/yaml.v2 v2.0.0-20170712054546-1be3d31502d6/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= @@ -777,7 +784,6 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= @@ -786,7 +792,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3 h1:3JgtbtFHMiCmsznwGVTUWbgGov+pVqnlf1dEJTNAXeM= honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/pkg/base/registry/etcdv3/registry.go b/pkg/base/registry/etcdv3/registry.go index 775ac012..2377fced 100644 --- a/pkg/base/registry/etcdv3/registry.go +++ b/pkg/base/registry/etcdv3/registry.go @@ -150,7 +150,6 @@ func (r *etcdRegistry) leaseKeeper() { select { case <-r.client.Done(): log.Info("leaseKeeper goroutine quit...") - break default: ttl, err := r.client.GetRawClient().TimeToLive(r.client.GetCtx(), *r.leaseWrp.leaseId) if err != nil { diff --git a/pkg/client/rm/abstract_resource_manager.go b/pkg/client/rm/abstract_resource_manager.go index 749ee085..47c83522 100644 --- a/pkg/client/rm/abstract_resource_manager.go +++ b/pkg/client/rm/abstract_resource_manager.go @@ -118,7 +118,7 @@ func (resourceManager AbstractResourceManager) doRegisterResource(serverAddress func (resourceManager AbstractResourceManager) getMergedResourceKeys() string { var builder strings.Builder if resourceManager.ResourceCache != nil && len(resourceManager.ResourceCache) > 0 { - for key, _ := range resourceManager.ResourceCache { + for key := range resourceManager.ResourceCache { builder.WriteString(key) builder.WriteString(DBKEYS_SPLIT_CHAR) } diff --git a/pkg/client/rpc_client.go b/pkg/client/rpc_client.go index 93d1bcd3..7a887a46 100644 --- a/pkg/client/rpc_client.go +++ b/pkg/client/rpc_client.go @@ -50,7 +50,7 @@ func (c *RpcClient) init() { getty.WithClientTaskPool(gxsync.NewTaskPoolSimple(0)), ) go gettyClient.RunEventLoop(c.newSession) - c.gettyClients = append(c.gettyClients, gettyClient) + // c.gettyClients = append(c.gettyClients, gettyClient) } } diff --git a/pkg/client/rpc_client/rpc_remoting_client.go b/pkg/client/rpc_client/rpc_remoting_client.go index 32699318..069af725 100644 --- a/pkg/client/rpc_client/rpc_remoting_client.go +++ b/pkg/client/rpc_client/rpc_remoting_client.go @@ -9,7 +9,7 @@ import ( import ( getty "github.com/apache/dubbo-getty" - + gxtime "github.com/dubbogo/gost/time" "github.com/pkg/errors" "go.uber.org/atomic" @@ -92,48 +92,52 @@ func (client *RpcRemoteClient) OnClose(session getty.Session) { // OnMessage ... func (client *RpcRemoteClient) OnMessage(session getty.Session, pkg interface{}) { - log.Info("received message:{%v}", pkg) + log.Debugf("received message: {%#v}", pkg) rpcMessage, ok := pkg.(protocal.RpcMessage) - if ok { - heartBeat, isHeartBeat := rpcMessage.Body.(protocal.HeartBeatMessage) - if isHeartBeat && heartBeat == protocal.HeartBeatMessagePong { - log.Debugf("received PONG from %s", session.RemoteAddr()) - return - } + if !ok { + log.Errorf("received message is not protocal.RpcMessage. pkg: %#v", pkg) + return + } + + heartBeat, isHeartBeat := rpcMessage.Body.(protocal.HeartBeatMessage) + if isHeartBeat && heartBeat == protocal.HeartBeatMessagePong { + log.Debugf("received PONG from %s", session.RemoteAddr()) + return } if rpcMessage.MessageType == protocal.MSGTypeRequest || rpcMessage.MessageType == protocal.MSGTypeRequestOneway { - log.Debugf("msgID:%s, body:%v", rpcMessage.ID, rpcMessage.Body) + log.Debugf("msgID: %d, body: %#v", rpcMessage.ID, rpcMessage.Body) client.onMessage(rpcMessage, session.RemoteAddr()) - } else { - mergedResult, isMergedResult := rpcMessage.Body.(protocal.MergeResultMessage) - if isMergedResult { - mm, loaded := client.mergeMsgMap.Load(rpcMessage.ID) - if loaded { - mergedMessage := mm.(protocal.MergedWarpMessage) - log.Infof("rpcMessageID: %d,rpcMessage :%v,result :%v", rpcMessage.ID, mergedMessage, mergedResult) - for i := 0; i < len(mergedMessage.Msgs); i++ { - msgID := mergedMessage.MsgIDs[i] - resp, loaded := client.futures.Load(msgID) - if loaded { - response := resp.(*getty2.MessageFuture) - response.Response = mergedResult.Msgs[i] - response.Done <- true - client.futures.Delete(msgID) - } + return + } + + mergedResult, isMergedResult := rpcMessage.Body.(protocal.MergeResultMessage) + if isMergedResult { + mm, loaded := client.mergeMsgMap.Load(rpcMessage.ID) + if loaded { + mergedMessage := mm.(protocal.MergedWarpMessage) + log.Infof("rpcMessageID: %d, rpcMessage: %#v, result: %#v", rpcMessage.ID, mergedMessage, mergedResult) + for i := 0; i < len(mergedMessage.Msgs); i++ { + msgID := mergedMessage.MsgIDs[i] + resp, loaded := client.futures.Load(msgID) + if loaded { + response := resp.(*getty2.MessageFuture) + response.Response = mergedResult.Msgs[i] + response.Done <- true + client.futures.Delete(msgID) } - client.mergeMsgMap.Delete(rpcMessage.ID) - } - } else { - resp, loaded := client.futures.Load(rpcMessage.ID) - if loaded { - response := resp.(*getty2.MessageFuture) - response.Response = rpcMessage.Body - response.Done <- true - client.futures.Delete(rpcMessage.ID) } + client.mergeMsgMap.Delete(rpcMessage.ID) + } + } else { + resp, loaded := client.futures.Load(rpcMessage.ID) + if loaded { + response := resp.(*getty2.MessageFuture) + response.Response = rpcMessage.Body + response.Done <- true + client.futures.Delete(rpcMessage.ID) } } } @@ -145,7 +149,7 @@ func (client *RpcRemoteClient) OnCron(session getty.Session) { func (client *RpcRemoteClient) onMessage(rpcMessage protocal.RpcMessage, serverAddress string) { msg := rpcMessage.Body.(protocal.MessageTypeAware) - log.Infof("onMessage: %v", msg) + log.Debugf("onMessage: %#v", msg) switch msg.GetTypeCode() { case protocal.TypeBranchCommit: client.BranchCommitRequestChannel <- RpcRMMessage{ @@ -213,19 +217,27 @@ func (client *RpcRemoteClient) sendAsyncRequest(session getty.Session, msg inter _, _, err = session.WritePkg(rpcMessage, time.Duration(0)) if err != nil { client.futures.Delete(rpcMessage.ID) + log.Errorf("send message: %#v, session: %s", rpcMessage, session.Stat()) + return nil, err } - log.Infof("send message : %v,session:%s", rpcMessage, session.Stat()) + + log.Debugf("send message: %#v, session: %s", rpcMessage, session.Stat()) if timeout > time.Duration(0) { select { - case <-getty.GetTimeWheel().After(timeout): + case <-gxtime.GetDefaultTimerWheel().After(timeout): client.futures.Delete(rpcMessage.ID) - return nil, errors.Errorf("wait response timeout,ip:%s,request:%v", session.RemoteAddr(), rpcMessage) + if session != nil { + return nil, errors.Errorf("wait response timeout, ip: %s, request: %#v", session.RemoteAddr(), rpcMessage) + } else { + return nil, errors.Errorf("wait response timeout and session is nil, request: %#v", rpcMessage) + } case <-resp.Done: err = resp.Err + return resp.Response, err } - return resp.Response, err } + return nil, err } @@ -243,13 +255,13 @@ func (client *RpcRemoteClient) sendAsyncRequest2(msg interface{}, timeout time.D client.rpcMessageChannel <- rpcMessage - log.Infof("send message : %v", rpcMessage) + log.Infof("send message: %#v", rpcMessage) if timeout > time.Duration(0) { select { - case <-getty.GetTimeWheel().After(timeout): + case <-gxtime.GetDefaultTimerWheel().After(timeout): client.futures.Delete(rpcMessage.ID) - return nil, errors.Errorf("wait response timeout, request:%v", rpcMessage) + return nil, errors.Errorf("wait response timeout, request: %#v", rpcMessage) case <-resp.Done: err = resp.Err } @@ -270,7 +282,7 @@ func (client *RpcRemoteClient) sendAsync(session getty.Session, msg interface{}) Compressor: 0, Body: msg, } - log.Infof("store message,id %d: %v", rpcMessage.ID, msg) + log.Infof("store message, id %d : %#v", rpcMessage.ID, msg) client.mergeMsgMap.Store(rpcMessage.ID, msg) //config timeout pkgLen, sendLen, err := session.WritePkg(rpcMessage, time.Duration(0)) diff --git a/pkg/client/tcc/proxy.go b/pkg/client/tcc/proxy.go index a27ef729..cbb496cf 100644 --- a/pkg/client/tcc/proxy.go +++ b/pkg/client/tcc/proxy.go @@ -115,7 +115,7 @@ func ImplementTCC(v TCCServiceProxy) { commitMethodDesc := proxy.Register(serviceProxy, ConfirmMethod) cancelMethodDesc := proxy.Register(serviceProxy, CancelMethod) - tryMethodDesc := proxy.Register(serviceProxy, methodName) + tryMethodDesc := proxy.Register(serviceProxy, TryMethod) tccResource := &TCCResource{ ResourceGroupID: "", diff --git a/pkg/client/tcc/tcc_resource_manager.go b/pkg/client/tcc/tcc_resource_manager.go index d39cfb2f..b3cdcae8 100644 --- a/pkg/client/tcc/tcc_resource_manager.go +++ b/pkg/client/tcc/tcc_resource_manager.go @@ -56,10 +56,11 @@ func (resourceManager TCCResourceManager) BranchCommit(branchType meta.BranchTyp args := make([]interface{}, 0) args = append(args, businessActionContext) returnValues := proxy.Invoke(tccResource.CommitMethod, nil, args) - log.Infof("TCC resource commit result : %v, xid: %s, branchID: %d, resourceID: %s", returnValues, xid, branchID, resourceID) - if returnValues != nil && len(returnValues) == 1 { + if returnValues != nil { + log.Infof("TCC resource commit result : %v, XID: %s, BranchID: %d, ResourceID: %s", returnValues[0].Interface(), xid, branchID, resourceID) result = returnValues[0].Interface().(bool) } + if result { return meta.BranchStatusPhaseTwoCommitted, nil } else { @@ -71,11 +72,13 @@ func (resourceManager TCCResourceManager) BranchRollback(branchType meta.BranchT resourceID string, applicationData []byte) (meta.BranchStatus, error) { resource := resourceManager.ResourceCache[resourceID] if resource == nil { - return 0, errors.Errorf("TCC resource is not exist, resourceID: %s", resourceID) + log.Errorf("TCC resource does not exist, resourceID: %s", resourceID) + return 0, errors.Errorf("TCC resource does not exist, resourceID: %s", resourceID) } tccResource := resource.(*TCCResource) if tccResource.RollbackMethod == nil { - return 0, errors.Errorf("TCC resource is not available, resourceID: %s", resourceID) + log.Errorf("TCC resource does not available, resourceID: %s", resourceID) + return 0, errors.Errorf("TCC resource does not available, resourceID: %s", resourceID) } result := false @@ -83,10 +86,11 @@ func (resourceManager TCCResourceManager) BranchRollback(branchType meta.BranchT args := make([]interface{}, 0) args = append(args, businessActionContext) returnValues := proxy.Invoke(tccResource.RollbackMethod, nil, args) - log.Infof("TCC resource rollback result : %v, xid: %s, branchID: %d, resourceID: %s", returnValues, xid, branchID, resourceID) - if returnValues != nil && len(returnValues) == 1 { + if returnValues != nil { + log.Infof("TCC resource rollback result : %v, XID: %s, BranchID: %d, ResourceID: %s", returnValues[0].Interface(), xid, branchID, resourceID) result = returnValues[0].Interface().(bool) } + if result { return meta.BranchStatusPhaseTwoRolledBack, nil } else { @@ -151,7 +155,7 @@ func (resourceManager TCCResourceManager) handleBranchRollback() { func (resourceManager TCCResourceManager) doBranchCommit(request protocal.BranchCommitRequest) protocal.BranchCommitResponse { var resp = protocal.BranchCommitResponse{} - log.Infof("Branch committing: %s %d %s %s", request.XID, request.BranchID, request.ResourceID, request.ApplicationData) + log.Infof("Branch committing, XID: %s, BranchID: %d, ResourceID: %s, ApplicationData: %s", request.XID, request.BranchID, request.ResourceID, request.ApplicationData) status, err := resourceManager.BranchCommit(request.BranchType, request.XID, request.BranchID, request.ResourceID, request.ApplicationData) if err != nil { resp.ResultCode = protocal.ResultCodeFailed @@ -176,7 +180,7 @@ func (resourceManager TCCResourceManager) doBranchCommit(request protocal.Branch func (resourceManager TCCResourceManager) doBranchRollback(request protocal.BranchRollbackRequest) protocal.BranchRollbackResponse { var resp = protocal.BranchRollbackResponse{} - log.Infof("Branch rolling back: %s %d %s", request.XID, request.BranchID, request.ResourceID) + log.Infof("Branch rolling back: XID: %s, BranchID: %d, ResourceID: %s, ApplicationData: %s", request.XID, request.BranchID, request.ResourceID, request.ApplicationData) status, err := resourceManager.BranchRollback(request.BranchType, request.XID, request.BranchID, request.ResourceID, request.ApplicationData) if err != nil { resp.ResultCode = protocal.ResultCodeFailed diff --git a/pkg/client/tm/global_transaction.go b/pkg/client/tm/global_transaction.go index 880994d2..557668c2 100644 --- a/pkg/client/tm/global_transaction.go +++ b/pkg/client/tm/global_transaction.go @@ -81,7 +81,7 @@ func (gtx *DefaultGlobalTransaction) BeginWithTimeoutAndName(timeout int32, name if gtx.Xid == "" { return errors.New("xid should not be empty") } - log.Debugf("Ignore Begin(): just involved in global transaction [%s]", gtx.Xid) + log.Debugf("Ignore Begin(): just involved in global transaction [XID: %s]", gtx.Xid) return nil } if gtx.Xid != "" { @@ -97,7 +97,7 @@ func (gtx *DefaultGlobalTransaction) BeginWithTimeoutAndName(timeout int32, name gtx.Xid = xid gtx.Status = meta.GlobalStatusBegin ctx.Bind(xid) - log.Infof("Begin new global transaction [%s]", xid) + log.Infof("Begin new global transaction [XID: %s]", xid) return nil } @@ -109,7 +109,7 @@ func (gtx *DefaultGlobalTransaction) Commit(ctx *context2.RootContext) error { } }() if gtx.Role == Participant { - log.Debugf("Ignore Commit(): just involved in global transaction [%s]", gtx.Xid) + log.Debugf("Ignore Commit(): just involved in global transaction [XID: %s]", gtx.Xid) return nil } if gtx.Xid == "" { @@ -119,7 +119,7 @@ func (gtx *DefaultGlobalTransaction) Commit(ctx *context2.RootContext) error { for retry > 0 { status, err := gtx.transactionManager.Commit(gtx.Xid) if err != nil { - log.Errorf("Failed to report global commit [%s],Retry Countdown: %d, reason: %s", gtx.Xid, retry, err.Error()) + log.Errorf("Failed to report global commit [XID: %s],Retry Countdown: %d, reason: %s", gtx.Xid, retry, err.Error()) } else { gtx.Status = status break @@ -129,7 +129,7 @@ func (gtx *DefaultGlobalTransaction) Commit(ctx *context2.RootContext) error { return errors.New("Failed to report global commit") } } - log.Infof("[%s] commit status: %s", gtx.Xid, gtx.Status.String()) + log.Infof("[XID: %s] commit status: %s", gtx.Xid, gtx.Status.String()) return nil } @@ -141,7 +141,7 @@ func (gtx *DefaultGlobalTransaction) Rollback(ctx *context2.RootContext) error { } }() if gtx.Role == Participant { - log.Debugf("Ignore Rollback(): just involved in global transaction [%s]", gtx.Xid) + log.Debugf("Ignore Rollback(): just involved in global transaction [XID: %s]", gtx.Xid) return nil } if gtx.Xid == "" { @@ -151,7 +151,7 @@ func (gtx *DefaultGlobalTransaction) Rollback(ctx *context2.RootContext) error { for retry > 0 { status, err := gtx.transactionManager.Rollback(gtx.Xid) if err != nil { - log.Errorf("Failed to report global rollback [%s],Retry Countdown: %d, reason: %s", gtx.Xid, retry, err.Error()) + log.Errorf("Failed to report global rollback [XID: %s],Retry Countdown: %d, reason: %s", gtx.Xid, retry, err.Error()) } else { gtx.Status = status break @@ -161,7 +161,7 @@ func (gtx *DefaultGlobalTransaction) Rollback(ctx *context2.RootContext) error { return errors.New("Failed to report global rollback") } } - log.Infof("[%s] rollback status: %s", gtx.Xid, gtx.Status.String()) + log.Infof("[XID: %s] rollback status: %s", gtx.Xid, gtx.Status.String()) return nil } @@ -225,7 +225,7 @@ func (gtx *DefaultGlobalTransaction) GlobalReport(globalStatus meta.GlobalStatus } gtx.Status = status - log.Infof("[%s] report status: %s", gtx.Xid, gtx.Status.String()) + log.Infof("[XID: %s] report status: %s", gtx.Xid, gtx.Status.String()) return nil } diff --git a/pkg/client/tm/proxy.go b/pkg/client/tm/proxy.go index 2fefd5ca..7e41c53c 100644 --- a/pkg/client/tm/proxy.go +++ b/pkg/client/tm/proxy.go @@ -55,14 +55,18 @@ func makeCallProxy(methodDesc *proxy.MethodDescriptor, txInfo *TransactionInfo) } tx := GetCurrentOrCreate(invCtx) - defer tx.Resume(suspendedResourcesHolder, invCtx) + + defer func() { + err := tx.Resume(suspendedResourcesHolder, invCtx) + if err != nil { + log.Errorf("error tx. Resume ret: %v", err) + } + }() switch txInfo.Propagation { case REQUIRED: - break case REQUIRES_NEW: suspendedResourcesHolder, _ = tx.Suspend(true, invCtx) - break case NOT_SUPPORTED: suspendedResourcesHolder, _ = tx.Suspend(true, invCtx) returnValues = proxy.Invoke(methodDesc, invCtx, args) @@ -72,7 +76,6 @@ func makeCallProxy(methodDesc *proxy.MethodDescriptor, txInfo *TransactionInfo) returnValues = proxy.Invoke(methodDesc, invCtx, args) return returnValues } - break case NEVER: if invCtx.InGlobalTransaction() { return proxy.ReturnWithError(methodDesc, errors.Errorf("Existing transaction found for transaction marked with propagation 'never',xid = %s", invCtx.GetXID())) @@ -84,7 +87,6 @@ func makeCallProxy(methodDesc *proxy.MethodDescriptor, txInfo *TransactionInfo) if !invCtx.InGlobalTransaction() { return proxy.ReturnWithError(methodDesc, errors.New("No existing transaction found for transaction marked with propagation 'mandatory'")) } - break default: return proxy.ReturnWithError(methodDesc, errors.Errorf("Not Supported Propagation: %s", txInfo.Propagation.String())) } diff --git a/pkg/tc/holder/db_transaction_store_manager.go b/pkg/tc/holder/db_transaction_store_manager.go index cdaf7ef4..6ebe22c6 100644 --- a/pkg/tc/holder/db_transaction_store_manager.go +++ b/pkg/tc/holder/db_transaction_store_manager.go @@ -89,7 +89,7 @@ func (storeManager *DBTransactionStoreManager) readSessionByStatuses(statuses [] states = append(states, int(status)) } globalTransactionDOs := storeManager.LogStore.QueryGlobalTransactionDOByStatuses(states, storeManager.logQueryLimit) - if globalTransactionDOs == nil || len(globalTransactionDOs) == 0 { + if len(globalTransactionDOs) == 0 { return nil } xids := make([]string, 0) @@ -145,7 +145,7 @@ func (storeManager *DBTransactionStoreManager) Shutdown() { func getGlobalSession(globalTransactionDO *model.GlobalTransactionDO, branchTransactionDOs []*model.BranchTransactionDO) *session.GlobalSession { globalSession := convertGlobalTransaction(globalTransactionDO) - if branchTransactionDOs != nil && len(branchTransactionDOs) > 0 { + if len(branchTransactionDOs) > 0 { for _, branchTransactionDO := range branchTransactionDOs { globalSession.Add(convertBranchSession(branchTransactionDO)) } diff --git a/pkg/tc/holder/file_based_session_manager.go b/pkg/tc/holder/file_based_session_manager.go index d2360136..a22a1150 100644 --- a/pkg/tc/holder/file_based_session_manager.go +++ b/pkg/tc/holder/file_based_session_manager.go @@ -79,9 +79,7 @@ func (sessionManager *FileBasedSessionManager) washSessions() { meta.GlobalStatusFinished: // Remove all sessions finished delete(sessionManager.SessionMap, globalSession.XID) - break default: - break } } } @@ -158,7 +156,6 @@ func (sessionManager *FileBasedSessionManager) restore(stores []*TransactionWrit break } default: - break } } } diff --git a/pkg/tc/holder/log_store_database_dao.go b/pkg/tc/holder/log_store_database_dao.go index c3f48261..bb95cceb 100644 --- a/pkg/tc/holder/log_store_database_dao.go +++ b/pkg/tc/holder/log_store_database_dao.go @@ -100,26 +100,20 @@ func (dao *LogStoreDataBaseDAO) InsertGlobalTransactionDO(globalTransaction mode globalTransaction.Timeout, globalTransaction.BeginTime, globalTransaction.ApplicationData) - if err == nil { - return true - } - return false + + return err == nil } func (dao *LogStoreDataBaseDAO) UpdateGlobalTransactionDO(globalTransaction model.GlobalTransactionDO) bool { _, err := dao.engine.Exec(UpdateGlobalTransactionDO, globalTransaction.Status, globalTransaction.XID) - if err == nil { - return true - } - return false + + return err == nil } func (dao *LogStoreDataBaseDAO) DeleteGlobalTransactionDO(globalTransaction model.GlobalTransactionDO) bool { _, err := dao.engine.Exec(DeleteGlobalTransactionDO, globalTransaction.XID) - if err == nil { - return true - } - return false + + return err == nil } func (dao *LogStoreDataBaseDAO) QueryBranchTransactionDOByXID(xid string) []*model.BranchTransactionDO { @@ -154,10 +148,8 @@ func (dao *LogStoreDataBaseDAO) InsertBranchTransactionDO(branchTransaction mode branchTransaction.Status, branchTransaction.ClientID, branchTransaction.ApplicationData) - if err == nil { - return true - } - return false + + return err == nil } func (dao *LogStoreDataBaseDAO) UpdateBranchTransactionDO(branchTransaction model.BranchTransactionDO) bool { @@ -165,20 +157,16 @@ func (dao *LogStoreDataBaseDAO) UpdateBranchTransactionDO(branchTransaction mode branchTransaction.Status, branchTransaction.XID, branchTransaction.BranchID) - if err == nil { - return true - } - return false + + return err == nil } func (dao *LogStoreDataBaseDAO) DeleteBranchTransactionDO(branchTransaction model.BranchTransactionDO) bool { _, err := dao.engine.Exec(DeleteBranchTransactionDO, branchTransaction.XID, branchTransaction.BranchID) - if err == nil { - return true - } - return false + + return err == nil } func (dao *LogStoreDataBaseDAO) GetCurrentMaxSessionID(high int64, low int64) int64 { diff --git a/pkg/tc/holder/session_holder.go b/pkg/tc/holder/session_holder.go index d338d1a0..8b498d69 100644 --- a/pkg/tc/holder/session_holder.go +++ b/pkg/tc/holder/session_holder.go @@ -62,17 +62,15 @@ func (sessionHolder SessionHolder) reload() { sessionManager.Reload() reloadedSessions := sessionHolder.RootSessionManager.AllSessions() - if reloadedSessions != nil && len(reloadedSessions) > 0 { + if len(reloadedSessions) > 0 { for _, globalSession := range reloadedSessions { switch globalSession.Status { case meta.GlobalStatusUnknown, meta.GlobalStatusCommitted, meta.GlobalStatusCommitFailed, meta.GlobalStatusRolledBack, meta.GlobalStatusRollbackFailed, meta.GlobalStatusTimeoutRolledBack, meta.GlobalStatusTimeoutRollbackFailed, meta.GlobalStatusFinished: log.Errorf("Reloaded Session should NOT be %s", globalSession.Status.String()) - break case meta.GlobalStatusAsyncCommitting: sessionHolder.AsyncCommittingSessionManager.AddGlobalSession(globalSession) - break default: branchSessions := globalSession.GetSortedBranches() for _, branchSession := range branchSessions { @@ -84,19 +82,14 @@ func (sessionHolder SessionHolder) reload() { globalSession.Status = meta.GlobalStatusCommitRetrying } sessionHolder.RetryCommittingSessionManager.AddGlobalSession(globalSession) - break case meta.GlobalStatusRollingBack, meta.GlobalStatusRollbackRetrying, meta.GlobalStatusTimeoutRollingBack, meta.GlobalStatusTimeoutRollbackRetrying: sessionHolder.RetryRollbackingSessionManager.AddGlobalSession(globalSession) - break case meta.GlobalStatusBegin: globalSession.Active = true - break default: log.Errorf("NOT properly handled %s", globalSession.Status) - break } - break } } } diff --git a/pkg/tc/holder/transaction_write_store.go b/pkg/tc/holder/transaction_write_store.go index ab04934f..19f298d3 100644 --- a/pkg/tc/holder/transaction_write_store.go +++ b/pkg/tc/holder/transaction_write_store.go @@ -41,10 +41,8 @@ func (transactionWriteStore *TransactionWriteStore) getSessionInstanceByOperatio switch transactionWriteStore.LogOperation { case LogOperationGlobalAdd, LogOperationGlobalUpdate, LogOperationGlobalRemove: sessionStorable = session.NewGlobalSession() - break case LogOperationBranchAdd, LogOperationBranchUpdate, LogOperationBranchRemove: sessionStorable = session.NewBranchSession() - break default: return nil, errors.New("incorrect logOperation.") } diff --git a/pkg/tc/lock/database_lock.go b/pkg/tc/lock/database_lock.go index f03337ff..cd7f431e 100644 --- a/pkg/tc/lock/database_lock.go +++ b/pkg/tc/lock/database_lock.go @@ -78,7 +78,7 @@ func (locker *DataBaseLocker) GetLockKeyCount() int64 { func convertToLockDO(locks []*RowLock) []*model.LockDO { lockDOs := make([]*model.LockDO, 0) - if locks == nil || len(locks) == 0 { + if len(locks) == 0 { return lockDOs } for _, lock := range locks { diff --git a/pkg/tc/metrics/metrics.go b/pkg/tc/metrics/metrics.go index 8101ef0f..651191fe 100644 --- a/pkg/tc/metrics/metrics.go +++ b/pkg/tc/metrics/metrics.go @@ -200,33 +200,25 @@ func (subscriber *MetricsSubscriber) ProcessGlobalTransactionEvent() { switch gtv.GetStatus() { case meta.GlobalStatusBegin: COUNTER_ACTIVE.Inc(1) - break case meta.GlobalStatusCommitted: COUNTER_ACTIVE.Dec(1) COUNTER_COMMITTED.Inc(1) SUMMARY_COMMITTED.Mark(1) TIMER_COMMITTED.Update(gtv.GetEndTime() - gtv.GetBeginTime()) - break case meta.GlobalStatusRolledBack: COUNTER_ACTIVE.Dec(1) COUNTER_ROLLBACKED.Inc(1) SUMMARY_ROLLBACKED.Mark(1) TIMER_ROLLBACK.Update(gtv.GetEndTime() - gtv.GetBeginTime()) - break case meta.GlobalStatusCommitFailed: COUNTER_ACTIVE.Dec(1) - break case meta.GlobalStatusRollbackFailed: COUNTER_ACTIVE.Dec(1) - break case meta.GlobalStatusTimeoutRolledBack: COUNTER_ACTIVE.Dec(1) - break case meta.GlobalStatusTimeoutRollbackFailed: COUNTER_ACTIVE.Dec(1) - break default: - break } } } diff --git a/pkg/tc/server/default_coordinator.go b/pkg/tc/server/default_coordinator.go index 75e12c1c..75e7d3c8 100644 --- a/pkg/tc/server/default_coordinator.go +++ b/pkg/tc/server/default_coordinator.go @@ -7,7 +7,7 @@ import ( import ( getty "github.com/apache/dubbo-getty" - + gxtime "github.com/dubbogo/gost/time" "github.com/pkg/errors" "go.uber.org/atomic" @@ -96,7 +96,7 @@ func (coordinator *DefaultCoordinator) sendAsyncRequest(session getty.Session, m if timeout > time.Duration(0) { select { - case <-getty.GetTimeWheel().After(timeout): + case <-gxtime.GetDefaultTimerWheel().After(timeout): coordinator.futures.Delete(rpcMessage.ID) return nil, errors.Errorf("wait response timeout, ip:%s, request:%v", session.Stat(), rpcMessage) case <-resp.Done: diff --git a/pkg/tc/server/getty_session_manager.go b/pkg/tc/server/getty_session_manager.go index 9ec8a6ed..0387d935 100644 --- a/pkg/tc/server/getty_session_manager.go +++ b/pkg/tc/server/getty_session_manager.go @@ -279,10 +279,7 @@ func (manager *GettySessionManager) GetGettySession(resourceID string, clientID return true }) - if resultSession != nil { - return false - } - return true + return resultSession == nil }) } } @@ -347,10 +344,8 @@ func getRMGettySessionFromIpMap(ipMap *sync.Map) getty.Session { } return true }) - if chosenSession != nil { - return false - } - return true + + return chosenSession == nil }) return chosenSession } diff --git a/pkg/tc/server/server.go b/pkg/tc/server/server.go index 1b121e69..9826f718 100644 --- a/pkg/tc/server/server.go +++ b/pkg/tc/server/server.go @@ -78,11 +78,7 @@ func (s *Server) newSession(session getty.Session) error { } func (s *Server) Start(addr string) { - var ( - tcpServer getty.Server - ) - - tcpServer = getty.NewTCPServer( + tcpServer := getty.NewTCPServer( getty.WithLocalAddress(addr), getty.WithServerTaskPool(gxsync.NewTaskPoolSimple(0)), ) diff --git a/pkg/tc/session/global_session.go b/pkg/tc/session/global_session.go index 24fe9f56..477c156c 100644 --- a/pkg/tc/session/global_session.go +++ b/pkg/tc/session/global_session.go @@ -170,7 +170,7 @@ func (gs *GlobalSession) GetSortedBranches() []*BranchSession { func (gs *GlobalSession) GetReverseSortedBranches() []*BranchSession { var branchSessions = gs.GetSortedBranches() - sort.Reverse(BranchSessionSlice(branchSessions)) + sort.Sort(sort.Reverse(BranchSessionSlice(branchSessions))) return branchSessions }