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/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 |
6 files changed, 25 insertions, 25 deletions
diff --git a/unmaintained/change_superblock/change_superblock.go b/unmaintained/change_superblock/change_superblock.go index afe651c4e..d07ab4552 100644 --- a/unmaintained/change_superblock/change_superblock.go +++ b/unmaintained/change_superblock/change_superblock.go @@ -7,7 +7,7 @@ import ( "path" "strconv" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/super_block" @@ -46,7 +46,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() @@ -54,7 +54,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) @@ -66,7 +66,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) @@ -79,7 +79,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) @@ -93,7 +93,7 @@ func main() { header := superBlock.Bytes() if n, e := datFile.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 6107f3d48..1fe4973ae 100644 --- a/unmaintained/diff_volume_servers/diff_volume_servers.go +++ b/unmaintained/diff_volume_servers/diff_volume_servers.go @@ -11,7 +11,7 @@ import ( "os" "strings" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/operation" "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" "github.com/chrislusf/seaweedfs/weed/security" @@ -47,7 +47,7 @@ func main() { vid := uint32(*volumeId) servers := strings.Split(*serversStr, ",") 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 string var maxOffset int64 @@ -55,7 +55,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 { @@ -101,7 +101,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 70bce3bf9..f08dc04de 100644 --- a/unmaintained/fix_dat/fix_dat.go +++ b/unmaintained/fix_dat/fix_dat.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/super_block" @@ -42,26 +42,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/remove_duplicate_fids/remove_duplicate_fids.go b/unmaintained/remove_duplicate_fids/remove_duplicate_fids.go index 84173a663..dae189610 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/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/storage/needle" @@ -49,7 +49,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) @@ -58,7 +58,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.Infof("duplicate checksum:%s fid:%d,%s%x @ offset:%d", checksum, *volumeId, n.Id, n.Cookie, offset) return nil } scanner.hashes[checksum] = true @@ -83,13 +83,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 17c494841..a666c461c 100644 --- a/unmaintained/see_dat/see_dat.go +++ b/unmaintained/see_dat/see_dat.go @@ -5,7 +5,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/util" "time" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/storage/needle" "github.com/chrislusf/seaweedfs/weed/storage/super_block" @@ -32,7 +32,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%x offset %d size %d(%s) cookie %x appendedAt %v", + log.Infof("%d,%s%x offset %d size %d(%s) cookie %x appendedAt %v", *volumeId, n.Id, n.Cookie, offset, n.Size, util.BytesToHumanReadable(uint64(n.Size)), n.Cookie, t) return nil } @@ -45,6 +45,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 22c659351..afc5667eb 100644 --- a/unmaintained/see_idx/see_idx.go +++ b/unmaintained/see_idx/see_idx.go @@ -8,7 +8,7 @@ import ( "path" "strconv" - "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/util/log" "github.com/chrislusf/seaweedfs/weed/storage/idx" "github.com/chrislusf/seaweedfs/weed/storage/types" ) @@ -32,7 +32,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() |
