diff options
| author | chrislu <chris.lu@gmail.com> | 2023-10-03 08:27:50 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-10-03 08:27:50 -0700 |
| commit | 249c0e06efd8cd4beb5624de63c01023033aabc5 (patch) | |
| tree | 0ac67e87ea7b774e59da09794dd876806602f604 | |
| parent | a78c4141e5075fd222dfff954fe6459c141ffe02 (diff) | |
| download | seaweedfs-249c0e06efd8cd4beb5624de63c01023033aabc5.tar.xz seaweedfs-249c0e06efd8cd4beb5624de63c01023033aabc5.zip | |
Revert "fix compilation"
This reverts commit 451ec6504d07812b074555a1fbb2a831bfa8e5e3.
| -rw-r--r-- | weed/storage/disk_location.go | 1 | ||||
| -rw-r--r-- | weed/storage/erasure_coding/ec_shard.go | 2 | ||||
| -rw-r--r-- | weed/storage/store.go | 1 | ||||
| -rw-r--r-- | weed/storage/volume_loading.go | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/weed/storage/disk_location.go b/weed/storage/disk_location.go index 377189c56..b7fa82197 100644 --- a/weed/storage/disk_location.go +++ b/weed/storage/disk_location.go @@ -177,7 +177,6 @@ func (l *DiskLocation) loadExistingVolume(dirEntry os.DirEntry, needleMapKind Ne } l.SetVolume(vid, v) - stats.VolumeServerVolumeCounter.WithLabelValues(v.Collection, "volume", v.DiskType().ReadableString()).Inc() size, _, _ := v.FileStat() glog.V(0).Infof("data file %s, replication=%s v=%d size=%d ttl=%s", diff --git a/weed/storage/erasure_coding/ec_shard.go b/weed/storage/erasure_coding/ec_shard.go index 08a50ebf7..85694e63b 100644 --- a/weed/storage/erasure_coding/ec_shard.go +++ b/weed/storage/erasure_coding/ec_shard.go @@ -7,6 +7,8 @@ import ( "strconv" "strings" + "github.com/seaweedfs/seaweedfs/weed/storage/types" + "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/types" diff --git a/weed/storage/store.go b/weed/storage/store.go index 9e8f30d99..6b4467abc 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -167,7 +167,6 @@ func (s *Store) addVolume(vid needle.VolumeId, collection string, needleMapKind location.Directory, vid, collection, replicaPlacement, ttl) if volume, err := NewVolume(location.Directory, location.IdxDirectory, collection, vid, needleMapKind, replicaPlacement, ttl, preallocate, memoryMapMaxSizeMb, ldbTimeout); err == nil { location.SetVolume(vid, volume) - stats.VolumeServerVolumeCounter.WithLabelValues(volume.Collection, "volume", volume.DiskType().ReadableString()).Inc() glog.V(0).Infof("add volume %d", vid) s.NewVolumesChan <- master_pb.VolumeShortInformationMessage{ Id: uint32(vid), diff --git a/weed/storage/volume_loading.go b/weed/storage/volume_loading.go index d7ed0acb0..e7018d52c 100644 --- a/weed/storage/volume_loading.go +++ b/weed/storage/volume_loading.go @@ -9,6 +9,7 @@ import ( "github.com/syndtr/goleveldb/leveldb/opt" "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/stats" "github.com/seaweedfs/seaweedfs/weed/storage/backend" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/super_block" @@ -200,6 +201,8 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind } } + stats.VolumeServerVolumeCounter.WithLabelValues(v.Collection, "volume", v.DiskType().ReadableString()).Inc() + if err == nil { hasLoadedVolume = true } |