[#1048] control: Rename `Blobstore` to `Blobstor`

Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>

config/example/node.yaml

@@ -100,7 +100,7 @@ storage:
   shard_pool_size: 15 # size of per-shard worker pools used for PUT operations
   shard_num: 2  # total number of shards
   default: # section with the default shard parameters
-    resync_metabase: true  # sync metabase with blobstore on start, expensive, leave false until complete understanding
+    resync_metabase: true  # sync metabase with blobstor on start, expensive, leave false until complete understanding
 
     use_write_cache: true  # use write-cache
 
@@ -131,7 +131,7 @@ storage:
 
   shard:
     0:
-      resync_metabase: false  # sync metabase with blobstore on start, expensive, leave false until complete understanding
+      resync_metabase: false  # sync metabase with blobstor on start, expensive, leave false until complete understanding
 
       use_write_cache: false  # use write-cache
 

pkg/services/control/server/list_shards.go

@@ -29,7 +29,7 @@ func (s *Server) ListShards(_ context.Context, req *control.ListShardsRequest) (
 
 		si.SetID(*shard.ID)
 		si.SetMetabasePath(shard.MetaBaseInfo.Path)
-		si.SetBlobstorePath(shard.BlobStorInfo.RootPath)
+		si.SetBlobstorPath(shard.BlobStorInfo.RootPath)
 		si.SetWriteCachePath(shard.WriteCacheInfo.Path)
 
 		// FIXME: use real shard mode when there are more than just `read-write`

pkg/services/control/service_test.go

@@ -101,7 +101,7 @@ func equalListShardResponseBodies(b1, b2 *control.ListShardsResponse_Body) bool
 
 	for i := range b1.Shards {
 		if b1.Shards[i].GetMetabasePath() != b2.Shards[i].GetMetabasePath() ||
-			b1.Shards[i].GetBlobstorePath() != b2.Shards[i].GetBlobstorePath() ||
+			b1.Shards[i].GetBlobstorPath() != b2.Shards[i].GetBlobstorPath() ||
 			b1.Shards[i].GetWritecachePath() != b2.Shards[i].GetWritecachePath() ||
 			!bytes.Equal(b1.Shards[i].GetShard_ID(), b2.Shards[i].GetShard_ID()) {
 			return false

pkg/services/control/types.go

@@ -327,8 +327,8 @@ func (x *ShardInfo) SetMetabasePath(v string) {
 	x.MetabasePath = v
 }
 
-// SetBlobstorePath sets path to shard's blobstore.
-func (x *ShardInfo) SetBlobstorePath(v string) {
+// SetBlobstorPath sets path to shard's blobstor.
+func (x *ShardInfo) SetBlobstorPath(v string) {
 	x.BlobstorPath = v
 }
 
@@ -346,7 +346,7 @@ const (
 	_ = iota
 	shardInfoIDFNum
 	shardInfoMetabaseFNum
-	shardInfoBlobstoreFNum
+	shardInfoBlobstorFNum
 	shardInfoWriteCacheFNum
 	shardInfoModeFNum
 )
@@ -364,7 +364,7 @@ func (x *ShardInfo) StableSize() int {
 
 	size += proto.BytesSize(shardInfoIDFNum, x.Shard_ID)
 	size += proto.StringSize(shardInfoMetabaseFNum, x.MetabasePath)
-	size += proto.StringSize(shardInfoBlobstoreFNum, x.BlobstorPath)
+	size += proto.StringSize(shardInfoBlobstorFNum, x.BlobstorPath)
 	size += proto.StringSize(shardInfoWriteCacheFNum, x.WritecachePath)
 	size += proto.EnumSize(shardInfoModeFNum, int32(x.Mode))
 
@@ -408,7 +408,7 @@ func (x *ShardInfo) StableMarshal(buf []byte) ([]byte, error) {
 
 	offset += n
 
-	n, err = proto.StringMarshal(shardInfoBlobstoreFNum, buf[offset:], x.BlobstorPath)
+	n, err = proto.StringMarshal(shardInfoBlobstorFNum, buf[offset:], x.BlobstorPath)
 	if err != nil {
 		return nil, err
 	}

pkg/services/control/types.pb.go

@@ -392,7 +392,7 @@ type ShardInfo struct {
 	Shard_ID []byte `protobuf:"bytes,1,opt,name=shard_ID,json=shardID,proto3" json:"shard_ID,omitempty"`
 	// Path to shard's metabase.
 	MetabasePath string `protobuf:"bytes,2,opt,name=metabase_path,json=metabasePath,proto3" json:"metabase_path,omitempty"`
-	// Path to shard's blobstore.
+	// Path to shard's blobstor.
 	BlobstorPath string `protobuf:"bytes,3,opt,name=blobstor_path,json=blobstorPath,proto3" json:"blobstor_path,omitempty"`
 	// Path to shard's write-cache, empty if disabled.
 	WritecachePath string `protobuf:"bytes,4,opt,name=writecache_path,json=writecachePath,proto3" json:"writecache_path,omitempty"`

pkg/services/control/types.proto

@@ -128,7 +128,7 @@ message ShardInfo {
     // Path to shard's metabase.
     string metabase_path = 2 [json_name = "metabasePath"];
 
-    // Path to shard's blobstore.
+    // Path to shard's blobstor.
     string blobstor_path = 3 [json_name = "blobstorPath"];
 
     // Path to shard's write-cache, empty if disabled.

pkg/services/control/types_test.go

@@ -136,7 +136,7 @@ func generateShardInfo() *control.ShardInfo {
 	si.SetID(bin)
 	si.SetMode(control.ShardMode_READ_WRITE)
 	si.SetMetabasePath(path)
-	si.SetBlobstorePath(path)
+	si.SetBlobstorPath(path)
 	si.SetWriteCachePath(path)
 
 	return si