aboutsummaryrefslogtreecommitdiff
path: root/weed/pb
diff options
context:
space:
mode:
Diffstat (limited to 'weed/pb')
-rw-r--r--weed/pb/filer_pb/filer_client.go26
-rw-r--r--weed/pb/filer_pb/filer_client_bfs.go4
-rw-r--r--weed/pb/filer_pb/filer_pb_helper.go10
-rw-r--r--weed/pb/filer_pb_tail.go10
-rw-r--r--weed/pb/grpc_client_server.go6
-rw-r--r--weed/pb/server_discovery.go6
6 files changed, 31 insertions, 31 deletions
diff --git a/weed/pb/filer_pb/filer_client.go b/weed/pb/filer_pb/filer_client.go
index 35cea71b3..c58ce1be4 100644
--- a/weed/pb/filer_pb/filer_client.go
+++ b/weed/pb/filer_pb/filer_client.go
@@ -10,7 +10,7 @@ import (
"strings"
"time"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/util"
)
@@ -36,15 +36,15 @@ func GetEntry(filerClient FilerClient, fullFilePath util.FullPath) (entry *Entry
Name: name,
}
- // glog.V(3).Infof("read %s request: %v", fullFilePath, request)
+ // log.V(0).Infof("read %s request: %v", fullFilePath, request)
resp, err := LookupEntry(client, request)
if err != nil {
- glog.V(3).Infof("read %s %v: %v", fullFilePath, resp, err)
+ log.V(0).Infof("read %s %v: %v", fullFilePath, resp, err)
return err
}
if resp.Entry == nil {
- // glog.V(3).Infof("read %s entry: %v", fullFilePath, entry)
+ // log.V(0).Infof("read %s entry: %v", fullFilePath, entry)
return nil
}
@@ -117,7 +117,7 @@ func doSeaweedList(client SeaweedFilerClient, fullDirPath util.FullPath, prefix
InclusiveStartFrom: inclusive,
}
- glog.V(4).Infof("read directory: %v", request)
+ log.V(-1).Infof("read directory: %v", request)
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
stream, err := client.ListEntries(ctx, request)
@@ -165,14 +165,14 @@ func Exists(filerClient FilerClient, parentDirectoryPath string, entryName strin
Name: entryName,
}
- glog.V(4).Infof("exists entry %v/%v: %v", parentDirectoryPath, entryName, request)
+ log.V(-1).Infof("exists entry %v/%v: %v", parentDirectoryPath, entryName, request)
resp, err := LookupEntry(client, request)
if err != nil {
if err == ErrNotFound {
exists = false
return nil
}
- glog.V(0).Infof("exists entry %v: %v", request, err)
+ log.V(3).Infof("exists entry %v: %v", request, err)
return fmt.Errorf("exists entry %s/%s: %v", parentDirectoryPath, entryName, err)
}
@@ -193,9 +193,9 @@ func Touch(filerClient FilerClient, parentDirectoryPath string, entryName string
Entry: entry,
}
- glog.V(4).Infof("touch entry %v/%v: %v", parentDirectoryPath, entryName, request)
+ log.V(-1).Infof("touch entry %v/%v: %v", parentDirectoryPath, entryName, request)
if err := UpdateEntry(client, request); err != nil {
- glog.V(0).Infof("touch exists entry %v: %v", request, err)
+ log.V(3).Infof("touch exists entry %v: %v", request, err)
return fmt.Errorf("touch exists entry %s/%s: %v", parentDirectoryPath, entryName, err)
}
@@ -232,9 +232,9 @@ func DoMkdir(client SeaweedFilerClient, parentDirectoryPath string, dirName stri
Entry: entry,
}
- glog.V(1).Infof("mkdir: %v", request)
+ log.V(2).Infof("mkdir: %v", request)
if err := CreateEntry(client, request); err != nil {
- glog.V(0).Infof("mkdir %v: %v", request, err)
+ log.V(3).Infof("mkdir %v: %v", request, err)
return fmt.Errorf("mkdir %s/%s: %v", parentDirectoryPath, dirName, err)
}
@@ -266,9 +266,9 @@ func MkFile(filerClient FilerClient, parentDirectoryPath string, fileName string
Entry: entry,
}
- glog.V(1).Infof("create file: %s/%s", parentDirectoryPath, fileName)
+ log.V(2).Infof("create file: %s/%s", parentDirectoryPath, fileName)
if err := CreateEntry(client, request); err != nil {
- glog.V(0).Infof("create file %v:%v", request, err)
+ log.V(3).Infof("create file %v:%v", request, err)
return fmt.Errorf("create file %s/%s: %v", parentDirectoryPath, fileName, err)
}
diff --git a/weed/pb/filer_pb/filer_client_bfs.go b/weed/pb/filer_pb/filer_client_bfs.go
index e43443706..641294cd3 100644
--- a/weed/pb/filer_pb/filer_client_bfs.go
+++ b/weed/pb/filer_pb/filer_client_bfs.go
@@ -3,7 +3,7 @@ package filer_pb
import (
"context"
"fmt"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"io"
"sync"
"time"
@@ -70,7 +70,7 @@ func processOneDirectory(filerClient FilerClient, parentPath util.FullPath, queu
}
func StreamBfs(client SeaweedFilerClient, dir util.FullPath, olderThanTsNs int64, fn func(parentPath util.FullPath, entry *Entry) error) (err error) {
- glog.V(0).Infof("TraverseBfsMetadata %v if before %v", dir, time.Unix(0, olderThanTsNs))
+ log.V(3).Infof("TraverseBfsMetadata %v if before %v", dir, time.Unix(0, olderThanTsNs))
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
stream, err := client.TraverseBfsMetadata(ctx, &TraverseBfsMetadataRequest{
diff --git a/weed/pb/filer_pb/filer_pb_helper.go b/weed/pb/filer_pb/filer_pb_helper.go
index 0ec31420c..967166fef 100644
--- a/weed/pb/filer_pb/filer_pb_helper.go
+++ b/weed/pb/filer_pb/filer_pb_helper.go
@@ -8,7 +8,7 @@ import (
"strings"
"time"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
"github.com/viant/ptrie"
"google.golang.org/protobuf/proto"
@@ -111,11 +111,11 @@ func AfterEntryDeserialization(chunks []*FileChunk) {
func CreateEntry(client SeaweedFilerClient, request *CreateEntryRequest) error {
resp, err := client.CreateEntry(context.Background(), request)
if err != nil {
- glog.V(1).Infof("create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, err)
+ log.V(2).Infof("create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, err)
return fmt.Errorf("CreateEntry: %v", err)
}
if resp.Error != "" {
- glog.V(1).Infof("create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, resp.Error)
+ log.V(2).Infof("create entry %s/%s %v: %v", request.Directory, request.Entry.Name, request.OExcl, resp.Error)
return fmt.Errorf("CreateEntry : %v", resp.Error)
}
return nil
@@ -124,7 +124,7 @@ func CreateEntry(client SeaweedFilerClient, request *CreateEntryRequest) error {
func UpdateEntry(client SeaweedFilerClient, request *UpdateEntryRequest) error {
_, err := client.UpdateEntry(context.Background(), request)
if err != nil {
- glog.V(1).Infof("update entry %s/%s :%v", request.Directory, request.Entry.Name, err)
+ log.V(2).Infof("update entry %s/%s :%v", request.Directory, request.Entry.Name, err)
return fmt.Errorf("UpdateEntry: %v", err)
}
return nil
@@ -136,7 +136,7 @@ func LookupEntry(client SeaweedFilerClient, request *LookupDirectoryEntryRequest
if err == ErrNotFound || strings.Contains(err.Error(), ErrNotFound.Error()) {
return nil, ErrNotFound
}
- glog.V(3).Infof("read %s/%v: %v", request.Directory, request.Name, err)
+ log.V(0).Infof("read %s/%v: %v", request.Directory, request.Name, err)
return nil, fmt.Errorf("LookupEntry1: %v", err)
}
if resp.Entry == nil {
diff --git a/weed/pb/filer_pb_tail.go b/weed/pb/filer_pb_tail.go
index b7cca7585..c29d36057 100644
--- a/weed/pb/filer_pb_tail.go
+++ b/weed/pb/filer_pb_tail.go
@@ -3,7 +3,7 @@ package pb
import (
"context"
"fmt"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
"github.com/seaweedfs/seaweedfs/weed/util"
"google.golang.org/grpc"
@@ -87,20 +87,20 @@ func makeSubscribeMetadataFunc(option *MetadataFollowOption, processEventFn Proc
if err := processEventFn(resp); err != nil {
switch option.EventErrorType {
case TrivialOnError:
- glog.Errorf("process %v: %v", resp, err)
+ log.Errorf("process %v: %v", resp, err)
case FatalOnError:
- glog.Fatalf("process %v: %v", resp, err)
+ log.Fatalf("process %v: %v", resp, err)
case RetryForeverOnError:
util.RetryUntil("followMetaUpdates", func() error {
return processEventFn(resp)
}, func(err error) bool {
- glog.Errorf("process %v: %v", resp, err)
+ log.Errorf("process %v: %v", resp, err)
return true
})
case DontLogError:
// pass
default:
- glog.Errorf("process %v: %v", resp, err)
+ log.Errorf("process %v: %v", resp, err)
}
}
option.StartTsNs = resp.TsNs
diff --git a/weed/pb/grpc_client_server.go b/weed/pb/grpc_client_server.go
index 777dfb402..ebeee328a 100644
--- a/weed/pb/grpc_client_server.go
+++ b/weed/pb/grpc_client_server.go
@@ -11,7 +11,7 @@ import (
"sync"
"time"
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb"
"github.com/seaweedfs/seaweedfs/weed/util"
@@ -190,7 +190,7 @@ func ServerToGrpcAddress(server string) (serverGrpcAddress string) {
host, port, parseErr := hostAndPort(server)
if parseErr != nil {
- glog.Fatalf("server address %s parse error: %v", server, parseErr)
+ log.Fatalf("server address %s parse error: %v", server, parseErr)
}
grpcPort := int(port) + 10000
@@ -201,7 +201,7 @@ func ServerToGrpcAddress(server string) (serverGrpcAddress string) {
func GrpcAddressToServerAddress(grpcAddress string) (serverAddress string) {
host, grpcPort, parseErr := hostAndPort(grpcAddress)
if parseErr != nil {
- glog.Fatalf("server grpc address %s parse error: %v", grpcAddress, parseErr)
+ log.Fatalf("server grpc address %s parse error: %v", grpcAddress, parseErr)
}
port := int(grpcPort) - 10000
diff --git a/weed/pb/server_discovery.go b/weed/pb/server_discovery.go
index 25c0360c5..f0fe2221a 100644
--- a/weed/pb/server_discovery.go
+++ b/weed/pb/server_discovery.go
@@ -1,7 +1,7 @@
package pb
import (
- "github.com/seaweedfs/seaweedfs/weed/glog"
+ "github.com/seaweedfs/seaweedfs/weed/util/log"
"reflect"
)
@@ -28,10 +28,10 @@ func (sd *ServerDiscovery) RefreshBySrvIfAvailable() {
}
newList, err := sd.srvRecord.LookUp()
if err != nil {
- glog.V(0).Infof("failed to lookup SRV for %s: %v", *sd.srvRecord, err)
+ log.V(3).Infof("failed to lookup SRV for %s: %v", *sd.srvRecord, err)
}
if newList == nil || len(newList) == 0 {
- glog.V(0).Infof("looked up SRV for %s, but found no well-formed names", *sd.srvRecord)
+ log.V(3).Infof("looked up SRV for %s, but found no well-formed names", *sd.srvRecord)
return
}
if !reflect.DeepEqual(sd.list, newList) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 00:23:36 +0000