diff options
Diffstat (limited to 'unmaintained')
| -rw-r--r-- | unmaintained/change_superblock/change_superblock.go | 12 | ||||
| -rw-r--r-- | unmaintained/diff_volume_servers/diff_volume_servers.go | 8 | ||||
| -rw-r--r-- | unmaintained/fix_dat/fix_dat.go | 10 | ||||
| -rw-r--r-- | unmaintained/load_test/load_test_meta_tail/load_test_meta_tail.go | 6 | ||||
| -rw-r--r-- | unmaintained/remove_duplicate_fids/remove_duplicate_fids.go | 10 | ||||
| -rw-r--r-- | unmaintained/see_dat/see_dat.go | 6 | ||||
| -rw-r--r-- | unmaintained/see_idx/see_idx.go | 4 |
7 files changed, 28 insertions, 28 deletions
diff --git a/unmaintained/change_superblock/change_superblock.go b/unmaintained/change_superblock/change_superblock.go index 52368f8cd..99b715095 100644 --- a/unmaintained/change_superblock/change_superblock.go +++ b/unmaintained/change_superblock/change_superblock.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage/backend" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/super_block" @@ -49,7 +49,7 @@ func main() { } datFile, err := os.OpenFile(path.Join(*fixVolumePath, fileName+".dat"), os.O_RDWR, 0644) if err != nil { - glog.Fatalf("Open Volume Data File [ERROR]: %v", err) + log.Fatalf("Open Volume Data File [ERROR]: %v", err) } datBackend := backend.NewDiskFile(datFile) defer datBackend.Close() @@ -57,7 +57,7 @@ func main() { superBlock, err := super_block.ReadSuperBlock(datBackend) if err != nil { - glog.Fatalf("cannot parse existing super block: %v", err) + log.Fatalf("cannot parse existing super block: %v", err) } fmt.Printf("Current Volume Replication: %s\n", superBlock.ReplicaPlacement) @@ -69,7 +69,7 @@ func main() { replica, err := super_block.NewReplicaPlacementFromString(*targetReplica) if err != nil { - glog.Fatalf("cannot parse target replica %s: %v", *targetReplica, err) + log.Fatalf("cannot parse target replica %s: %v", *targetReplica, err) } fmt.Printf("Changing replication to: %s\n", replica) @@ -82,7 +82,7 @@ func main() { ttl, err := needle.ReadTTL(*targetTTL) if err != nil { - glog.Fatalf("cannot parse target ttl %s: %v", *targetTTL, err) + log.Fatalf("cannot parse target ttl %s: %v", *targetTTL, err) } fmt.Printf("Changing ttl to: %s\n", ttl) @@ -96,7 +96,7 @@ func main() { header := superBlock.Bytes() if n, e := datBackend.WriteAt(header, 0); n == 0 || e != nil { - glog.Fatalf("cannot write super block: %v", e) + log.Fatalf("cannot write super block: %v", e) } fmt.Println("Change Applied.") diff --git a/unmaintained/diff_volume_servers/diff_volume_servers.go b/unmaintained/diff_volume_servers/diff_volume_servers.go index e289fefe8..2269bc6b1 100644 --- a/unmaintained/diff_volume_servers/diff_volume_servers.go +++ b/unmaintained/diff_volume_servers/diff_volume_servers.go @@ -10,7 +10,7 @@ import ( "math" "os" - "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" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" @@ -49,7 +49,7 @@ func main() { vid := uint32(*volumeId) servers := pb.ServerAddresses(*serversStr).ToAddresses() if len(servers) < 2 { - glog.Fatalf("You must specify more than 1 server\n") + log.Fatalf("You must specify more than 1 server\n") } var referenceServer pb.ServerAddress var maxOffset int64 @@ -57,7 +57,7 @@ func main() { for _, addr := range servers { files, offset, err := getVolumeFiles(vid, addr) if err != nil { - glog.Fatalf("Failed to copy idx from volume server %s\n", err) + log.Fatalf("Failed to copy idx from volume server %s\n", err) } allFiles[addr] = files if offset > maxOffset { @@ -103,7 +103,7 @@ func main() { id, err = getNeedleFileId(vid, nid, addr) } if err != nil { - glog.Fatalf("Failed to get needle info %d from volume server %s\n", nid, err) + log.Fatalf("Failed to get needle info %d from volume server %s\n", nid, err) } fmt.Println(id, addr, diffMsg) } diff --git a/unmaintained/fix_dat/fix_dat.go b/unmaintained/fix_dat/fix_dat.go index 164b5b238..8c5bf6f94 100644 --- a/unmaintained/fix_dat/fix_dat.go +++ b/unmaintained/fix_dat/fix_dat.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage/backend" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/super_block" @@ -45,26 +45,26 @@ func main() { } indexFile, err := os.OpenFile(path.Join(*fixVolumePath, fileName+".idx"), os.O_RDONLY, 0644) if err != nil { - glog.Fatalf("Read Volume Index %v", err) + log.Fatalf("Read Volume Index %v", err) } defer indexFile.Close() datFileName := path.Join(*fixVolumePath, fileName+".dat") datFile, err := os.OpenFile(datFileName, os.O_RDONLY, 0644) if err != nil { - glog.Fatalf("Read Volume Data %v", err) + log.Fatalf("Read Volume Data %v", err) } datBackend := backend.NewDiskFile(datFile) defer datBackend.Close() newDatFile, err := os.Create(path.Join(*fixVolumePath, fileName+".dat_fixed")) if err != nil { - glog.Fatalf("Write New Volume Data %v", err) + log.Fatalf("Write New Volume Data %v", err) } defer newDatFile.Close() superBlock, err := super_block.ReadSuperBlock(datBackend) if err != nil { - glog.Fatalf("Read Volume Data superblock %v", err) + log.Fatalf("Read Volume Data superblock %v", err) } newDatFile.Write(superBlock.Bytes()) diff --git a/unmaintained/load_test/load_test_meta_tail/load_test_meta_tail.go b/unmaintained/load_test/load_test_meta_tail/load_test_meta_tail.go index 2b63d5d59..8965d35ca 100644 --- a/unmaintained/load_test/load_test_meta_tail/load_test_meta_tail.go +++ b/unmaintained/load_test/load_test_meta_tail/load_test_meta_tail.go @@ -3,7 +3,7 @@ package main import ( "flag" "fmt" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" @@ -38,7 +38,7 @@ func main() { return nil } name := event.EventNotification.NewEntry.Name - glog.V(0).Infof("=> %s ts:%+v", name, time.Unix(0, event.TsNs)) + log.V(3).Infof("=> %s ts:%+v", name, time.Unix(0, event.TsNs)) id := name[4:] if x, err := strconv.Atoi(id); err == nil { if x != expected { @@ -59,7 +59,7 @@ func startGenerateMetadata() { for i := 0; i < *n; i++ { name := fmt.Sprintf("file%d", i) - glog.V(0).Infof("write %s/%s", *dir, name) + log.V(3).Infof("write %s/%s", *dir, name) if err := filer_pb.CreateEntry(client, &filer_pb.CreateEntryRequest{ Directory: *dir, Entry: &filer_pb.Entry{ diff --git a/unmaintained/remove_duplicate_fids/remove_duplicate_fids.go b/unmaintained/remove_duplicate_fids/remove_duplicate_fids.go index cfac97432..c29536949 100644 --- a/unmaintained/remove_duplicate_fids/remove_duplicate_fids.go +++ b/unmaintained/remove_duplicate_fids/remove_duplicate_fids.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/storage/backend" "github.com/seaweedfs/seaweedfs/weed/storage/needle" @@ -50,7 +50,7 @@ func (scanner *VolumeFileScanner4SeeDat) VisitNeedle(n *needle.Needle, offset in newFileName := filepath.Join(*volumePath, "dat_fixed") newDatFile, err := os.Create(newFileName) if err != nil { - glog.Fatalf("Write New Volume Data %v", err) + log.Fatalf("Write New Volume Data %v", err) } scanner.datBackend = backend.NewDiskFile(newDatFile) scanner.datBackend.WriteAt(scanner.block.Bytes(), 0) @@ -59,7 +59,7 @@ func (scanner *VolumeFileScanner4SeeDat) VisitNeedle(n *needle.Needle, offset in checksum := Checksum(n) if scanner.hashes[checksum] { - glog.V(0).Infof("duplicate checksum:%s fid:%d,%s%x @ offset:%d", checksum, *volumeId, n.Id, n.Cookie, offset) + log.V(3).Infof("duplicate checksum:%s fid:%d,%s%x @ offset:%d", checksum, *volumeId, n.Id, n.Cookie, offset) return nil } scanner.hashes[checksum] = true @@ -85,13 +85,13 @@ func main() { if _, err := os.Stat(scanner.dir); err != nil { if err := os.MkdirAll(scanner.dir, os.ModePerm); err != nil { - glog.Fatalf("could not create output dir : %s", err) + log.Fatalf("could not create output dir : %s", err) } } err := storage.ScanVolumeFile(*volumePath, *volumeCollection, vid, storage.NeedleMapInMemory, scanner) if err != nil { - glog.Fatalf("Reading Volume File [ERROR] %s\n", err) + log.Fatalf("Reading Volume File [ERROR] %s\n", err) } } diff --git a/unmaintained/see_dat/see_dat.go b/unmaintained/see_dat/see_dat.go index a60e45760..53286ac5f 100644 --- a/unmaintained/see_dat/see_dat.go +++ b/unmaintained/see_dat/see_dat.go @@ -6,7 +6,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/storage/super_block" @@ -34,7 +34,7 @@ func (scanner *VolumeFileScanner4SeeDat) ReadNeedleBody() bool { func (scanner *VolumeFileScanner4SeeDat) VisitNeedle(n *needle.Needle, offset int64, needleHeader, needleBody []byte) error { t := time.Unix(int64(n.AppendAtNs)/int64(time.Second), int64(n.AppendAtNs)%int64(time.Second)) - glog.V(0).Infof("%d,%s%08x offset %d size %d(%s) cookie %08x appendedAt %v name %s", + log.V(3).Infof("%d,%s%08x offset %d size %d(%s) cookie %08x appendedAt %v name %s", *volumeId, n.Id, n.Cookie, offset, n.Size, util.BytesToHumanReadable(uint64(n.Size)), n.Cookie, t, n.Name) return nil } @@ -48,6 +48,6 @@ func main() { scanner := &VolumeFileScanner4SeeDat{} err := storage.ScanVolumeFile(*volumePath, *volumeCollection, vid, storage.NeedleMapInMemory, scanner) if err != nil { - glog.Fatalf("Reading Volume File [ERROR] %s\n", err) + log.Fatalf("Reading Volume File [ERROR] %s\n", err) } } diff --git a/unmaintained/see_idx/see_idx.go b/unmaintained/see_idx/see_idx.go index 87f00ebb0..e6c22bc5d 100644 --- a/unmaintained/see_idx/see_idx.go +++ b/unmaintained/see_idx/see_idx.go @@ -9,7 +9,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/seaweedfs/seaweedfs/weed/glog" + "github.com/seaweedfs/seaweedfs/weed/util/log" "github.com/seaweedfs/seaweedfs/weed/storage/idx" "github.com/seaweedfs/seaweedfs/weed/storage/types" util_http "github.com/seaweedfs/seaweedfs/weed/util/http" @@ -36,7 +36,7 @@ func main() { } indexFile, err := os.OpenFile(path.Join(*fixVolumePath, fileName+".idx"), os.O_RDONLY, 0644) if err != nil { - glog.Fatalf("Create Volume Index [ERROR] %s\n", err) + log.Fatalf("Create Volume Index [ERROR] %s\n", err) } defer indexFile.Close() |
