diff options
Diffstat (limited to 'weed/topology/topology_vacuum.go')
| -rw-r--r-- | weed/topology/topology_vacuum.go | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/weed/topology/topology_vacuum.go b/weed/topology/topology_vacuum.go index 83be65d7c..8671a8945 100644 --- a/weed/topology/topology_vacuum.go +++ b/weed/topology/topology_vacuum.go @@ -15,7 +15,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/storage/needle" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" ) @@ -43,7 +43,7 @@ func (t *Topology) batchVacuumVolumeCheck(grpcDialOption grpc.DialOption, vid ne return nil }) if err != nil { - glog.V(0).Infof("Checking vacuuming %d on %s: %v", vid, url, err) + log.V(3).Infof("Checking vacuuming %d on %s: %v", vid, url, err) } }(index, dn.ServerAddress(), vid) } @@ -74,7 +74,7 @@ func (t *Topology) batchVacuumVolumeCompact(grpcDialOption grpc.DialOption, vl * ch := make(chan bool, locationlist.Length()) for index, dn := range locationlist.list { go func(index int, url pb.ServerAddress, vid needle.VolumeId) { - glog.V(0).Infoln(index, "Start vacuuming", vid, "on", url) + log.V(3).Infoln(index, "Start vacuuming", vid, "on", url) err := operation.WithVolumeServerClient(true, url, grpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { stream, err := volumeServerClient.VacuumVolumeCompact(context.Background(), &volume_server_pb.VacuumVolumeCompactRequest{ VolumeId: uint32(vid), @@ -93,16 +93,16 @@ func (t *Topology) batchVacuumVolumeCompact(grpcDialOption grpc.DialOption, vl * return recvErr } } - glog.V(0).Infof("%d vacuum %d on %s processed %d bytes, loadAvg %.02f%%", + log.V(3).Infof("%d vacuum %d on %s processed %d bytes, loadAvg %.02f%%", index, vid, url, resp.ProcessedBytes, resp.LoadAvg_1M*100) } return nil }) if err != nil { - glog.Errorf("Error when vacuuming %d on %s: %v", vid, url, err) + log.Errorf("Error when vacuuming %d on %s: %v", vid, url, err) ch <- false } else { - glog.V(0).Infof("Complete vacuuming %d on %s", vid, url) + log.V(3).Infof("Complete vacuuming %d on %s", vid, url) ch <- true } }(index, dn.ServerAddress(), vid) @@ -128,7 +128,7 @@ func (t *Topology) batchVacuumVolumeCommit(grpcDialOption grpc.DialOption, vl *V isReadOnly := false isFullCapacity := false for _, dn := range vacuumLocationList.list { - glog.V(0).Infoln("Start Committing vacuum", vid, "on", dn.Url()) + log.V(3).Infoln("Start Committing vacuum", vid, "on", dn.Url()) err := operation.WithVolumeServerClient(false, dn.ServerAddress(), grpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { resp, err := volumeServerClient.VacuumVolumeCommit(context.Background(), &volume_server_pb.VacuumVolumeCommitRequest{ VolumeId: uint32(vid), @@ -144,10 +144,10 @@ func (t *Topology) batchVacuumVolumeCommit(grpcDialOption grpc.DialOption, vl *V return err }) if err != nil { - glog.Errorf("Error when committing vacuum %d on %s: %v", vid, dn.Url(), err) + log.Errorf("Error when committing vacuum %d on %s: %v", vid, dn.Url(), err) isCommitSuccess = false } else { - glog.V(0).Infof("Complete Committing vacuum %d on %s", vid, dn.Url()) + log.V(3).Infof("Complete Committing vacuum %d on %s", vid, dn.Url()) } } @@ -177,7 +177,7 @@ func (t *Topology) batchVacuumVolumeCommit(grpcDialOption grpc.DialOption, vl *V return err }) if err != nil { - glog.Errorf("Error when checking volume %d status on %s: %v", vid, dn.Url(), err) + log.Errorf("Error when checking volume %d status on %s: %v", vid, dn.Url(), err) //we mark volume read-only, since the volume state is unknown isReadOnly = true } @@ -201,7 +201,7 @@ func (t *Topology) batchVacuumVolumeCommit(grpcDialOption grpc.DialOption, vl *V func (t *Topology) batchVacuumVolumeCleanup(grpcDialOption grpc.DialOption, vl *VolumeLayout, vid needle.VolumeId, locationlist *VolumeLocationList) { for _, dn := range locationlist.list { - glog.V(0).Infoln("Start cleaning up", vid, "on", dn.Url()) + log.V(3).Infoln("Start cleaning up", vid, "on", dn.Url()) err := operation.WithVolumeServerClient(false, dn.ServerAddress(), grpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { _, err := volumeServerClient.VacuumVolumeCleanup(context.Background(), &volume_server_pb.VacuumVolumeCleanupRequest{ VolumeId: uint32(vid), @@ -209,9 +209,9 @@ func (t *Topology) batchVacuumVolumeCleanup(grpcDialOption grpc.DialOption, vl * return err }) if err != nil { - glog.Errorf("Error when cleaning up vacuum %d on %s: %v", vid, dn.Url(), err) + log.Errorf("Error when cleaning up vacuum %d on %s: %v", vid, dn.Url(), err) } else { - glog.V(0).Infof("Complete cleaning up vacuum %d on %s", vid, dn.Url()) + log.V(3).Infof("Complete cleaning up vacuum %d on %s", vid, dn.Url()) } } } @@ -221,14 +221,14 @@ func (t *Topology) Vacuum(grpcDialOption grpc.DialOption, garbageThreshold float // if there is vacuum going on, return immediately swapped := atomic.CompareAndSwapInt64(&t.vacuumLockCounter, 0, 1) if !swapped { - glog.V(0).Infof("Vacuum is already running") + log.V(3).Infof("Vacuum is already running") return } defer atomic.StoreInt64(&t.vacuumLockCounter, 0) // now only one vacuum process going on - glog.V(1).Infof("Start vacuum on demand with threshold: %f collection: %s volumeId: %d", + log.V(2).Infof("Start vacuum on demand with threshold: %f collection: %s volumeId: %d", garbageThreshold, collection, volumeId) for _, col := range t.collectionMap.Items() { c := col.(*Collection) @@ -255,7 +255,7 @@ func (t *Topology) Vacuum(grpcDialOption grpc.DialOption, garbageThreshold float } } if automatic && t.isDisableVacuum { - glog.V(0).Infof("Vacuum is disabled") + log.V(3).Infof("Vacuum is disabled") break } } @@ -348,11 +348,11 @@ func (t *Topology) vacuumOneVolumeId(grpcDialOption grpc.DialOption, volumeLayou return } if !isEnoughCopies { - glog.Warningf("skip vacuuming: not enough copies for volume:%d", vid) + log.Warningf("skip vacuuming: not enough copies for volume:%d", vid) return } - glog.V(1).Infof("check vacuum on collection:%s volume:%d", c.Name, vid) + log.V(2).Infof("check vacuum on collection:%s volume:%d", c.Name, vid) if vacuumLocationList, needVacuum := t.batchVacuumVolumeCheck( grpcDialOption, vid, locationList, garbageThreshold); needVacuum { if t.batchVacuumVolumeCompact(grpcDialOption, volumeLayout, vid, vacuumLocationList, preallocate) { |
