Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer (GitLab) <jacob@gitlab.com>2018-07-04 05:23:43 +0300
committerAlejandro Rodríguez <alejorro70@gmail.com>2018-07-04 05:23:43 +0300
commit47a97102efab3f77a1141e0c92e2ef849a08dbb2 (patch)
tree86b927e5ad598f9b78f5b13f2594f232df459081
parent108e6eb01265487ef6202f8c71657cc18901248f (diff)
Remove unnecessary existence check in AddNamespace
-rw-r--r--changelogs/unreleased/add-namespace-remove-check.yml5
-rw-r--r--internal/service/namespace/namespace.go12
2 files changed, 9 insertions, 8 deletions
diff --git a/changelogs/unreleased/add-namespace-remove-check.yml b/changelogs/unreleased/add-namespace-remove-check.yml
new file mode 100644
index 000000000..e0ab389d8
--- /dev/null
+++ b/changelogs/unreleased/add-namespace-remove-check.yml
@@ -0,0 +1,5 @@
+---
+title: Remove unnecessary existence check in AddNamespace
+merge_request: 785
+author:
+type: other
diff --git a/internal/service/namespace/namespace.go b/internal/service/namespace/namespace.go
index 290397d01..ae0f98a79 100644
--- a/internal/service/namespace/namespace.go
+++ b/internal/service/namespace/namespace.go
@@ -40,16 +40,12 @@ func (s *server) AddNamespace(ctx context.Context, in *pb.AddNamespaceRequest) (
return nil, err
}
- // Make idempotent, as it's called through Sidekiq
- // Exists check will return an err if in.GetName() == ""
- existsRequest := &pb.NamespaceExistsRequest{StorageName: in.StorageName, Name: in.Name}
- if exists, err := s.NamespaceExists(ctx, existsRequest); err != nil {
- return nil, err
- } else if exists.Exists {
- return &pb.AddNamespaceResponse{}, nil
+ name := in.GetName()
+ if len(name) == 0 {
+ return nil, noNameError
}
- if err = os.MkdirAll(namespacePath(storagePath, in.GetName()), 0770); err != nil {
+ if err = os.MkdirAll(namespacePath(storagePath, name), 0770); err != nil {
return nil, status.Errorf(codes.Internal, "create directory: %v", err)
}