gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

comment out println

Browse Source
This commit is contained in:
chrislu
2024-04-02 15:31:31 -07:00
parent d935f70e3c
commit f37c0d0d7a
3 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
weed/mq/broker/broker_grpc_pub.go
View File

@@ -79,7 +79,7 @@ func (b *MessageQueueBroker) PublishMessage(stream mq_pb.SeaweedMessaging_Publis
} }
go func() { go func() {
defer func() { defer func() {
println("stop sending ack to publisher", initMessage.PublisherName) // println("stop sending ack to publisher", initMessage.PublisherName)
}() }()
lastAckTime := time.Now() lastAckTime := time.Now()
@@ -93,7 +93,7 @@ func (b *MessageQueueBroker) PublishMessage(stream mq_pb.SeaweedMessaging_Publis
if err := stream.Send(response); err != nil { if err := stream.Send(response); err != nil {
glog.Errorf("Error sending response %v: %v", response, err) glog.Errorf("Error sending response %v: %v", response, err)
} }
println("sent ack", acknowledgedSequence, "=>", initMessage.PublisherName) // println("sent ack", acknowledgedSequence, "=>", initMessage.PublisherName)
lastAckTime = time.Now() lastAckTime = time.Now()
} else { } else {
time.Sleep(1 * time.Second) time.Sleep(1 * time.Second)

7
weed/mq/broker/broker_grpc_pub_follow.go
View File

@@ -58,10 +58,9 @@ func (b *MessageQueueBroker) PublishFollowMe(stream mq_pb.SeaweedMessaging_Publi
if err := stream.Send(&mq_pb.PublishFollowMeResponse{ if err := stream.Send(&mq_pb.PublishFollowMeResponse{
AckTsNs: dataMessage.TsNs, AckTsNs: dataMessage.TsNs,
}); err != nil { }); err != nil {
// TODO save un-acked messages to disk
glog.Errorf("Error sending response %v: %v", dataMessage, err) glog.Errorf("Error sending response %v: %v", dataMessage, err)
} }
println("ack", string(dataMessage.Key), dataMessage.TsNs) // println("ack", string(dataMessage.Key), dataMessage.TsNs)
} else if closeMessage := req.GetClose(); closeMessage != nil { } else if closeMessage := req.GetClose(); closeMessage != nil {
glog.V(0).Infof("topic %v partition %v publish stream closed: %v", initMessage.Topic, initMessage.Partition, closeMessage) glog.V(0).Infof("topic %v partition %v publish stream closed: %v", initMessage.Topic, initMessage.Partition, closeMessage)
break break
@@ -74,7 +73,7 @@ func (b *MessageQueueBroker) PublishFollowMe(stream mq_pb.SeaweedMessaging_Publi
for mem, found := inMemoryBuffers.PeekHead(); found; mem, found = inMemoryBuffers.PeekHead() { for mem, found := inMemoryBuffers.PeekHead(); found; mem, found = inMemoryBuffers.PeekHead() {
if mem.stopTime.UnixNano() <= flushMessage.TsNs { if mem.stopTime.UnixNano() <= flushMessage.TsNs {
inMemoryBuffers.Dequeue() inMemoryBuffers.Dequeue()
println("dropping flushed messages: ", mem.startTime.UnixNano(), mem.stopTime.UnixNano(), len(mem.buf)) // println("dropping flushed messages: ", mem.startTime.UnixNano(), mem.stopTime.UnixNano(), len(mem.buf))
} else { } else {
break break
} }
@@ -117,8 +116,6 @@ func (b *MessageQueueBroker) PublishFollowMe(stream mq_pb.SeaweedMessaging_Publi
targetFile := fmt.Sprintf("%s/%s", partitionDir, startTime.Format(topic.TIME_FORMAT)) targetFile := fmt.Sprintf("%s/%s", partitionDir, startTime.Format(topic.TIME_FORMAT))
// TODO append block with more metadata
for { for {
if err := b.appendToFile(targetFile, mem.buf); err != nil { if err := b.appendToFile(targetFile, mem.buf); err != nil {
glog.V(0).Infof("metadata log write failed %s: %v", targetFile, err) glog.V(0).Infof("metadata log write failed %s: %v", targetFile, err)

8
weed/mq/topic/local_partition.go
View File

@@ -56,7 +56,7 @@ func (p *LocalPartition) Publish(message *mq_pb.DataMessage) error {
// maybe send to the follower // maybe send to the follower
if p.followerStream != nil { if p.followerStream != nil {
println("recv", string(message.Key), message.TsNs) // println("recv", string(message.Key), message.TsNs)
if followErr := p.followerStream.Send(&mq_pb.PublishFollowMeRequest{ if followErr := p.followerStream.Send(&mq_pb.PublishFollowMeRequest{
Message: &mq_pb.PublishFollowMeRequest_Data{ Message: &mq_pb.PublishFollowMeRequest_Data{
Data: message, Data: message,
@@ -166,7 +166,7 @@ func (p *LocalPartition) MaybeConnectToFollowers(initMessage *mq_pb.PublishMessa
// start receiving ack from follower // start receiving ack from follower
go func() { go func() {
defer func() { defer func() {
println("stop receiving ack from follower") // println("stop receiving ack from follower")
}() }()
for { for {
@@ -181,7 +181,7 @@ func (p *LocalPartition) MaybeConnectToFollowers(initMessage *mq_pb.PublishMessa
return return
} }
atomic.StoreInt64(&p.AckTsNs, ack.AckTsNs) atomic.StoreInt64(&p.AckTsNs, ack.AckTsNs)
println("recv ack", ack.AckTsNs) // println("recv ack", ack.AckTsNs)
} }
}() }()
return nil return nil
@@ -234,6 +234,6 @@ func (p *LocalPartition) NotifyLogFlushed(flushTsNs int64) {
}); followErr != nil { }); followErr != nil {
glog.Errorf("send follower %s flush message: %v", p.follower, followErr) glog.Errorf("send follower %s flush message: %v", p.follower, followErr)
} }
println("notifying", p.follower, "flushed at", flushTsNs) // println("notifying", p.follower, "flushed at", flushTsNs)
} }
} }