diff options
| author | Chris Lu <chris.lu@gmail.com> | 2020-08-29 21:01:14 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2020-08-29 21:01:14 -0700 |
| commit | ef75ce8a34f1c073c802abd713fd316eeb5274b6 (patch) | |
| tree | cd6cbd5792c7360ab400470e70d127442458fc30 | |
| parent | b69cb74c033376d6738ef1537593c2349196bdb6 (diff) | |
| download | seaweedfs-ef75ce8a34f1c073c802abd713fd316eeb5274b6.tar.xz seaweedfs-ef75ce8a34f1c073c802abd713fd316eeb5274b6.zip | |
use UTC for all time related folders
| -rw-r--r-- | weed/filer2/filer_notify.go | 3 | ||||
| -rw-r--r-- | weed/messaging/broker/broker_grpc_server_subscribe.go | 1 | ||||
| -rw-r--r-- | weed/messaging/broker/topic_manager.go | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/weed/filer2/filer_notify.go b/weed/filer2/filer_notify.go index 19a7e70f0..96776a359 100644 --- a/weed/filer2/filer_notify.go +++ b/weed/filer2/filer_notify.go @@ -74,6 +74,8 @@ func (f *Filer) logMetaEvent(ctx context.Context, fullpath string, eventNotifica func (f *Filer) logFlushFunc(startTime, stopTime time.Time, buf []byte) { + startTime, stopTime = startTime.UTC(), stopTime.UTC() + targetFile := fmt.Sprintf("%s/%04d-%02d-%02d/%02d-%02d.segment", SystemLogDir, startTime.Year(), startTime.Month(), startTime.Day(), startTime.Hour(), startTime.Minute(), // startTime.Second(), startTime.Nanosecond(), @@ -91,6 +93,7 @@ func (f *Filer) logFlushFunc(startTime, stopTime time.Time, buf []byte) { func (f *Filer) ReadPersistedLogBuffer(startTime time.Time, eachLogEntryFn func(logEntry *filer_pb.LogEntry) error) (lastTsNs int64, err error) { + startTime = startTime.UTC() startDate := fmt.Sprintf("%04d-%02d-%02d", startTime.Year(), startTime.Month(), startTime.Day()) startHourMinute := fmt.Sprintf("%02d-%02d.segment", startTime.Hour(), startTime.Minute()) diff --git a/weed/messaging/broker/broker_grpc_server_subscribe.go b/weed/messaging/broker/broker_grpc_server_subscribe.go index 9a7d653b5..8cc5a928c 100644 --- a/weed/messaging/broker/broker_grpc_server_subscribe.go +++ b/weed/messaging/broker/broker_grpc_server_subscribe.go @@ -125,6 +125,7 @@ func (broker *MessageBroker) Subscribe(stream messaging_pb.SeaweedMessaging_Subs } func (broker *MessageBroker) readPersistedLogBuffer(tp *TopicPartition, startTime time.Time, eachLogEntryFn func(logEntry *filer_pb.LogEntry) error) (err error) { + startTime = startTime.UTC() startDate := fmt.Sprintf("%04d-%02d-%02d", startTime.Year(), startTime.Month(), startTime.Day()) startHourMinute := fmt.Sprintf("%02d-%02d.segment", startTime.Hour(), startTime.Minute()) diff --git a/weed/messaging/broker/topic_manager.go b/weed/messaging/broker/topic_manager.go index b563fffa1..93815f8f4 100644 --- a/weed/messaging/broker/topic_manager.go +++ b/weed/messaging/broker/topic_manager.go @@ -56,6 +56,7 @@ func (tm *TopicManager) buildLogBuffer(tl *TopicControl, tp TopicPartition, topi // fmt.Printf("flushing with topic config %+v\n", topicConfig) + startTime, stopTime = startTime.UTC(), stopTime.UTC() targetFile := fmt.Sprintf( "%s/%s/%s/%04d-%02d-%02d/%02d-%02d.part%02d", filer2.TopicsDir, tp.Namespace, tp.Topic, |