fix lint problems and readWrite lock optimization (#1455)

* fix lint problems (#1451) Co-authored-by: l00618052 <lishitong1@huawei.com> * readWrite lock optimization * add local storage test --------- Co-authored-by: l00618052 <lishitong1@huawei.com>
apache · Jan 17, 2024 · 58dd5cd · 58dd5cd
1 parent 803802a
commit 58dd5cd
Show file tree

Hide file tree

Showing 60 changed files with 218 additions and 156 deletions.
diff --git a/.github/workflows/static_check.yml b/.github/workflows/static_check.yml
@@ -43,6 +43,20 @@ jobs:
           sudo docker-compose -f ./scripts/docker-compose.yaml up -d
           sleep 20
           bash -x scripts/ut_test_in_docker.sh mongo
+  local:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up Go 1.18
+        uses: actions/setup-go@v1
+        with:
+          go-version: 1.18
+        id: go
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v1
+      - name: UT-LOCAL_STORAGE
+        run: |
+          rm -rf /data/schemas
+          bash -x scripts/ut_test_in_docker.sh local
   integration-test:
     runs-on: ubuntu-latest
     steps:

diff --git a/client/client.go b/client/client.go
@@ -35,7 +35,7 @@ type Client struct {
 	Cfg Config
 }
 
-func (c *Client) CommonHeaders(ctx context.Context) http.Header {
+func (c *Client) CommonHeaders(_ context.Context) http.Header {
 	var headers = make(http.Header)
 	// TODO overwrote by context values
 	if len(c.Cfg.Token) > 0 {

diff --git a/client/websocket.go b/client/websocket.go
@@ -29,7 +29,7 @@ import (
 	"github.com/apache/servicecomb-service-center/pkg/util"
 )
 
-func (c *LBClient) WebsocketDial(ctx context.Context, api string, headers http.Header) (conn *websocket.Conn, err error) {
+func (c *LBClient) WebsocketDial(_ context.Context, api string, headers http.Header) (conn *websocket.Conn, err error) {
 	dialer := &websocket.Dialer{TLSClientConfig: c.TLS}
 	var errs []string
 	for i := 0; i < c.Retries; i++ {

diff --git a/datasource/dependency_util.go b/datasource/dependency_util.go
@@ -60,7 +60,7 @@ func toString(in *discovery.MicroServiceKey) string {
 	return path.GenerateProviderDependencyRuleKey(in.Tenant, in)
 }
 
-func ParseAddOrUpdateRules(ctx context.Context, dep *Dependency, oldProviderRules *discovery.MicroServiceDependency) {
+func ParseAddOrUpdateRules(_ context.Context, dep *Dependency, oldProviderRules *discovery.MicroServiceDependency) {
 	deleteDependencyRuleList := make([]*discovery.MicroServiceKey, 0, len(oldProviderRules.Dependency))
 	createDependencyRuleList := make([]*discovery.MicroServiceKey, 0, len(dep.ProvidersRule))
 	existDependencyRuleList := make([]*discovery.MicroServiceKey, 0, len(oldProviderRules.Dependency))
@@ -83,7 +83,7 @@ func ParseAddOrUpdateRules(ctx context.Context, dep *Dependency, oldProviderRule
 	setDep(dep, createDependencyRuleList, existDependencyRuleList, deleteDependencyRuleList)
 }
 
-func ParseOverrideRules(ctx context.Context, dep *Dependency, oldProviderRules *discovery.MicroServiceDependency) {
+func ParseOverrideRules(_ context.Context, dep *Dependency, oldProviderRules *discovery.MicroServiceDependency) {
 	deleteDependencyRuleList := make([]*discovery.MicroServiceKey, 0, len(oldProviderRules.Dependency))
 	createDependencyRuleList := make([]*discovery.MicroServiceKey, 0, len(dep.ProvidersRule))
 	existDependencyRuleList := make([]*discovery.MicroServiceKey, 0, len(oldProviderRules.Dependency))

diff --git a/datasource/etcd/account.go b/datasource/etcd/account.go
@@ -40,7 +40,7 @@ func init() {
 	rbac.Install("embedded_etcd", NewRbacDAO)
 }
 
-func NewRbacDAO(opts rbac.Options) (rbac.DAO, error) {
+func NewRbacDAO(_ rbac.Options) (rbac.DAO, error) {
 	return &RbacDAO{}, nil
 }
 
@@ -187,7 +187,7 @@ func (ds *RbacDAO) DeleteAccount(ctx context.Context, names []string) (bool, err
 	return true, nil
 }
 
-func (ds *RbacDAO) UpdateAccount(ctx context.Context, name string, account *crbac.Account) error {
+func (ds *RbacDAO) UpdateAccount(ctx context.Context, _ string, account *crbac.Account) error {
 	var (
 		opts []etcdadpt.OpOptions
 		err  error

diff --git a/datasource/etcd/cache/filter_consumer.go b/datasource/etcd/cache/filter_consumer.go
@@ -30,7 +30,7 @@ func (f *ConsumerFilter) Name(ctx context.Context, _ *cache.Node) string {
 	return ctx.Value(CtxConsumerID).(string)
 }
 
-func (f *ConsumerFilter) Init(ctx context.Context, parent *cache.Node) (node *cache.Node, err error) {
+func (f *ConsumerFilter) Init(_ context.Context, _ *cache.Node) (node *cache.Node, err error) {
 	node = cache.NewNode()
 	node.Cache.Set(DepResult, &DependencyRuleItem{})
 	return

diff --git a/datasource/etcd/cache/filter_service.go b/datasource/etcd/cache/filter_service.go
@@ -38,7 +38,7 @@ func (f *ServiceFilter) Name(ctx context.Context, _ *cache.Node) string {
 		provider.ServiceName}, "/")
 }
 
-func (f *ServiceFilter) Init(ctx context.Context, parent *cache.Node) (node *cache.Node, err error) {
+func (f *ServiceFilter) Init(_ context.Context, _ *cache.Node) (node *cache.Node, err error) {
 	node = cache.NewNode()
 	return
 }
diff --git a/datasource/etcd/cache/filter_version.go b/datasource/etcd/cache/filter_version.go
@@ -39,7 +39,7 @@ func (f *VersionFilter) Name(ctx context.Context, _ *cache.Node) string {
 	return ""
 }
 
-func (f *VersionFilter) Init(ctx context.Context, parent *cache.Node) (node *cache.Node, err error) {
+func (f *VersionFilter) Init(ctx context.Context, _ *cache.Node) (node *cache.Node, err error) {
 	instance, ok := ctx.Value(CtxProviderInstanceKey).(*pb.HeartbeatSetElement)
 	if ok {
 		node = cache.NewNode()

diff --git a/datasource/etcd/cache/instance.go b/datasource/etcd/cache/instance.go
@@ -96,8 +96,8 @@ func (f *FindInstancesCache) GetWithProviderID(ctx context.Context, consumer *pb
 func (f *FindInstancesCache) Remove(provider *pb.MicroServiceKey) {
 	f.Tree.Remove(context.WithValue(context.Background(), CtxProviderKey, provider))
 	if len(provider.Alias) > 0 {
-		copy := *provider
-		copy.ServiceName = copy.Alias
-		f.Tree.Remove(context.WithValue(context.Background(), CtxProviderKey, &copy))
+		copyProvider := *provider
+		copyProvider.ServiceName = copyProvider.Alias
+		f.Tree.Remove(context.WithValue(context.Background(), CtxProviderKey, &copyProvider))
 	}
 }
diff --git a/datasource/etcd/ms.go b/datasource/etcd/ms.go
@@ -22,18 +22,11 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/apache/servicecomb-service-center/datasource/local"
+	"os"
 	"path/filepath"
 	"strconv"
 	"time"
 
-	"github.com/apache/servicecomb-service-center/syncer/service/event"
-	pb "github.com/go-chassis/cari/discovery"
-	"github.com/go-chassis/cari/pkg/errsvc"
-	"github.com/go-chassis/cari/sync"
-	"github.com/go-chassis/foundation/gopool"
-	"github.com/little-cui/etcdadpt"
-
 	"github.com/apache/servicecomb-service-center/datasource"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/cache"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/path"
@@ -42,12 +35,19 @@ import (
 	esync "github.com/apache/servicecomb-service-center/datasource/etcd/sync"
 	eutil "github.com/apache/servicecomb-service-center/datasource/etcd/util"
 	serviceUtil "github.com/apache/servicecomb-service-center/datasource/etcd/util"
+	"github.com/apache/servicecomb-service-center/datasource/local"
 	"github.com/apache/servicecomb-service-center/datasource/schema"
 	"github.com/apache/servicecomb-service-center/pkg/log"
 	"github.com/apache/servicecomb-service-center/pkg/util"
 	"github.com/apache/servicecomb-service-center/server/core"
 	"github.com/apache/servicecomb-service-center/server/plugin/uuid"
 	quotasvc "github.com/apache/servicecomb-service-center/server/service/quota"
+	"github.com/apache/servicecomb-service-center/syncer/service/event"
+	pb "github.com/go-chassis/cari/discovery"
+	"github.com/go-chassis/cari/pkg/errsvc"
+	"github.com/go-chassis/cari/sync"
+	"github.com/go-chassis/foundation/gopool"
+	"github.com/little-cui/etcdadpt"
 )
 
 type MetadataManager struct {
@@ -188,7 +188,7 @@ func (ds *MetadataManager) RegisterService(ctx context.Context, request *pb.Crea
 	}, nil
 }
 
-func (ds *MetadataManager) ListService(ctx context.Context, request *pb.GetServicesRequest) (
+func (ds *MetadataManager) ListService(ctx context.Context, _ *pb.GetServicesRequest) (
 	*pb.GetServicesResponse, error) {
 	services, err := eutil.GetAllServiceUtil(ctx)
 	if err != nil {
@@ -217,7 +217,7 @@ func (ds *MetadataManager) GetService(ctx context.Context, request *pb.GetServic
 	return singleService, nil
 }
 
-func (ds *MetadataManager) GetOverview(ctx context.Context, request *pb.GetServicesRequest) (
+func (ds *MetadataManager) GetOverview(ctx context.Context, _ *pb.GetServicesRequest) (
 	*pb.Statistics, error) {
 	ctx = util.WithCacheOnly(ctx)
 	st, err := statistics(ctx, false)
@@ -879,10 +879,9 @@ func (ds *MetadataManager) SendManyHeartbeat(ctx context.Context, request *pb.He
 			log.Warn(fmt.Sprintf("instance[%s/%s] is duplicate request heartbeat set",
 				heartbeatElement.ServiceId, heartbeatElement.InstanceId))
 			continue
-		} else {
-			existFlag[heartbeatElement.ServiceId+heartbeatElement.InstanceId] = true
-			noMultiCounter++
 		}
+		existFlag[heartbeatElement.ServiceId+heartbeatElement.InstanceId] = true
+		noMultiCounter++
 		gopool.Go(getHeartbeatFunc(ctx, domainProject, instancesHbRst, heartbeatElement))
 	}
 	count := 0
@@ -944,7 +943,7 @@ func (ds *MetadataManager) SendHeartbeat(ctx context.Context, request *pb.Heartb
 	return nil
 }
 
-func (ds *MetadataManager) ListManyInstances(ctx context.Context, request *pb.GetAllInstancesRequest) (*pb.GetAllInstancesResponse, error) {
+func (ds *MetadataManager) ListManyInstances(ctx context.Context, _ *pb.GetAllInstancesRequest) (*pb.GetAllInstancesResponse, error) {
 	domainProject := util.ParseDomainProject(ctx)
 	key := path.GetInstanceRootKey(domainProject) + path.SPLIT
 	opts := append(eutil.FromContext(ctx), etcdadpt.WithStrKey(key), etcdadpt.WithPrefix())
@@ -1506,6 +1505,10 @@ func (ds *MetadataManager) UnregisterService(ctx context.Context, request *pb.De
 				if rollbackErr != nil {
 					log.Error("clean tmp dir error when rollback in UnregisterService", err)
 				}
+				rollbackErr = os.Remove(originPath)
+				if rollbackErr != nil {
+					log.Error("clean origin dir error when rollback in UnregisterService", err)
+				}
 			}
 		}
 	}()

diff --git a/datasource/etcd/schema.go b/datasource/etcd/schema.go
@@ -43,7 +43,7 @@ func init() {
 	schema.Install("embedded_etcd", NewSchemaDAO)
 }
 
-func NewSchemaDAO(opts schema.Options) (schema.DAO, error) {
+func NewSchemaDAO(_ schema.Options) (schema.DAO, error) {
 	return &SchemaDAO{}, nil
 }
 

diff --git a/datasource/etcd/sd/aggregate/repo.go b/datasource/etcd/sd/aggregate/repo.go
@@ -33,6 +33,6 @@ func (r *Repository) New(t kvstore.Type, cfg *kvstore.Options) state.State {
 	return NewAggregator(t, cfg)
 }
 
-func NewRepository(opts state.Config) state.Repository {
+func NewRepository(_ state.Config) state.Repository {
 	return &Repository{}
 }
diff --git a/datasource/etcd/sd/k8s/adaptor/listwatcher.go b/datasource/etcd/sd/k8s/adaptor/listwatcher.go
@@ -50,7 +50,7 @@ type k8sListWatcher struct {
 	cb OnEventFunc
 }
 
-func (w *k8sListWatcher) Handle(ctx context.Context, obj interface{}) {
+func (w *k8sListWatcher) Handle(_ context.Context, obj interface{}) {
 	if w.cb == nil {
 		return
 	}

diff --git a/datasource/etcd/sd/k8s/repo.go b/datasource/etcd/sd/k8s/repo.go
@@ -37,6 +37,6 @@ func (r *Repository) New(t kvstore.Type, cfg *kvstore.Options) state.State {
 	return adaptor.NewK8sAdaptor(t, cfg)
 }
 
-func NewRepository(opts state.Config) state.Repository {
+func NewRepository(_ state.Config) state.Repository {
 	return &Repository{}
 }
diff --git a/datasource/etcd/sd/servicecenter/repo.go b/datasource/etcd/sd/servicecenter/repo.go
@@ -33,6 +33,6 @@ func (r *Repository) New(t kvstore.Type, cfg *kvstore.Options) state.State {
 	return NewServiceCenterAdaptor(t, cfg)
 }
 
-func NewRepository(opts state.Config) state.Repository {
+func NewRepository(_ state.Config) state.Repository {
 	return &Repository{}
 }
diff --git a/datasource/etcd/sd/servicecenter/syncer.go b/datasource/etcd/sd/servicecenter/syncer.go
@@ -175,7 +175,7 @@ func (c *Syncer) checkWithConflictHandleFunc(local *Cacher, remote dump.Getter,
 	}
 }
 
-func (c *Syncer) skipHandleFunc(origin *dump.KV, conflict dump.Getter, index int) {
+func (c *Syncer) skipHandleFunc(_ *dump.KV, _ dump.Getter, _ int) {
 }
 
 func (c *Syncer) logConflictFunc(origin *dump.KV, conflict dump.Getter, index int) {

diff --git a/datasource/etcd/state/etcd/repo.go b/datasource/etcd/state/etcd/repo.go
@@ -34,6 +34,6 @@ func (r *Repository) New(t kvstore.Type, cfg *kvstore.Options) state.State {
 	return NewEtcdState(t.String(), cfg)
 }
 
-func NewRepository(opts state.Config) state.Repository {
+func NewRepository(_ state.Config) state.Repository {
 	return &Repository{}
 }
diff --git a/datasource/etcd/state/kvstore/cache_null.go b/datasource/etcd/state/kvstore/cache_null.go
@@ -25,17 +25,17 @@ var (
 type nullCache struct {
 }
 
-func (n *nullCache) Name() string                                         { return "NULL" }
-func (n *nullCache) Size() int                                            { return 0 }
-func (n *nullCache) Get(k string) *KeyValue                               { return nil }
-func (n *nullCache) GetAll(arr *[]*KeyValue) int                          { return 0 }
-func (n *nullCache) GetPrefix(prefix string, arr *[]*KeyValue) int        { return 0 }
-func (n *nullCache) ForEach(iter func(k string, v *KeyValue) (next bool)) {}
-func (n *nullCache) Put(k string, v *KeyValue)                            {}
-func (n *nullCache) Remove(k string)                                      {}
-func (n *nullCache) MarkDirty()                                           {}
-func (n *nullCache) Dirty() bool                                          { return false }
-func (n *nullCache) Clear()                                               {}
+func (n *nullCache) Name() string                                      { return "NULL" }
+func (n *nullCache) Size() int                                         { return 0 }
+func (n *nullCache) Get(_ string) *KeyValue                            { return nil }
+func (n *nullCache) GetAll(_ *[]*KeyValue) int                         { return 0 }
+func (n *nullCache) GetPrefix(_ string, _ *[]*KeyValue) int            { return 0 }
+func (n *nullCache) ForEach(_ func(k string, v *KeyValue) (next bool)) {}
+func (n *nullCache) Put(_ string, _ *KeyValue)                         {}
+func (n *nullCache) Remove(_ string)                                   {}
+func (n *nullCache) MarkDirty()                                        {}
+func (n *nullCache) Dirty() bool                                       { return false }
+func (n *nullCache) Clear()                                            {}
 
 type nullCacher struct {
 }

diff --git a/datasource/etcd/state/kvstore/indexer_cache.go b/datasource/etcd/state/kvstore/indexer_cache.go
@@ -33,7 +33,7 @@ type CacheIndexer struct {
 	Cache CacheReader
 }
 
-func (i *CacheIndexer) Search(ctx context.Context, opts ...etcdadpt.OpOption) (resp *Response, _ error) {
+func (i *CacheIndexer) Search(_ context.Context, opts ...etcdadpt.OpOption) (resp *Response, _ error) {
 	op := etcdadpt.OpGet(opts...)
 	if op.Prefix {
 		resp = i.searchByPrefix(op)

diff --git a/datasource/etcd/util/dependency_query.go b/datasource/etcd/util/dependency_query.go
@@ -168,9 +168,8 @@ func (dr *DependencyRelation) GetDependencyConsumers(opts ...DependencyRelationF
 				log.Warn(fmt.Sprintf("consumer[%s/%s/%s/%s] does not exist",
 					consumer.Environment, consumer.AppId, consumer.ServiceName, consumer.Version))
 				continue
-			} else {
-				return nil, err
 			}
+			return nil, err
 		}
 
 		if op.NonSelf && service.ServiceId == dr.provider.ServiceId {
@@ -234,9 +233,9 @@ func (dr *DependencyRelation) GetDependencyConsumersOfProvider() ([]*pb.MicroSer
 }
 
 func (dr *DependencyRelation) GetConsumerOfSameServiceNameAndAppID(provider *pb.MicroServiceKey) ([]*pb.MicroServiceKey, error) {
-	copy := *provider
-	copy.Version = ""
-	prefix := path.GenerateProviderDependencyRuleKey(dr.domainProject, &copy)
+	copyProvider := *provider
+	copyProvider.Version = ""
+	prefix := path.GenerateProviderDependencyRuleKey(dr.domainProject, &copyProvider)
 
 	opts := append(FromContext(dr.ctx),
 		etcdadpt.WithStrKey(prefix),

diff --git a/datasource/etcd/util/microservice_util.go b/datasource/etcd/util/microservice_util.go
@@ -21,6 +21,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"path/filepath"
 	"strings"
 
 	pb "github.com/go-chassis/cari/discovery"
@@ -31,6 +32,8 @@ import (
 	"github.com/apache/servicecomb-service-center/datasource/etcd/sd"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/state/kvstore"
 	"github.com/apache/servicecomb-service-center/datasource/etcd/sync"
+	"github.com/apache/servicecomb-service-center/datasource/local"
+	"github.com/apache/servicecomb-service-center/datasource/schema"
 	"github.com/apache/servicecomb-service-center/pkg/log"
 	"github.com/apache/servicecomb-service-center/pkg/util"
 	"github.com/apache/servicecomb-service-center/server/config"
@@ -163,17 +166,17 @@ func searchServiceIDFromAlias(ctx context.Context, key *pb.MicroServiceKey) (str
 }
 
 func GetServiceAllVersions(ctx context.Context, key *pb.MicroServiceKey, alias bool) (*kvstore.Response, error) {
-	copy := *key
-	copy.Version = ""
+	copyKey := *key
+	copyKey.Version = ""
 	var (
 		prefix  string
 		indexer kvstore.Indexer
 	)
 	if alias {
-		prefix = path.GenerateServiceAliasKey(&copy)
+		prefix = path.GenerateServiceAliasKey(&copyKey)
 		indexer = sd.ServiceAlias()
 	} else {
-		prefix = path.GenerateServiceIndexKey(&copy)
+		prefix = path.GenerateServiceIndexKey(&copyKey)
 		indexer = sd.ServiceIndex()
 	}
 	opts := append(FromContext(ctx),
@@ -247,6 +250,32 @@ func UpdateService(ctx context.Context, domainProject string, serviceID string,
 		log.Error("marshal service file failed", err)
 		return opts, err
 	}
+
+	if schema.StorageType == "local" {
+		contents := make([]*schema.ContentItem, len(service.Schemas))
+		err = schema.Instance().PutManyContent(ctx, &schema.PutManyContentRequest{
+			ServiceID: service.ServiceId,
+			SchemaIDs: service.Schemas,
+			Contents:  contents,
+			Init:      true,
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		serviceMutex := local.GetOrCreateMutex(service.ServiceId)
+		serviceMutex.Lock()
+		defer serviceMutex.Unlock()
+	}
+	defer func() {
+		if schema.StorageType == "local" && err != nil {
+			cleanDirErr := local.CleanDir(filepath.Join(schema.RootFilePath, domainProject, service.ServiceId))
+			if cleanDirErr != nil {
+				log.Error("clean dir error when rollback in RegisterService", cleanDirErr)
+			}
+		}
+	}()
+
 	opt := etcdadpt.OpPut(etcdadpt.WithStrKey(key), etcdadpt.WithValue(data))
 	opts = append(opts, opt)
 	syncOpts, err := sync.GenUpdateOpts(ctx, datasource.ResourceKV, data, sync.WithOpts(map[string]string{"key": key}))