Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rm msgs log, too many #1159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

rm msgs log, too many #1159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 24 additions & 27 deletions consumer/push_consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,11 +821,11 @@ func (pc *pushConsumer) pullMessage(request *PullRequest) {
SuspendTimeoutMillis: 20 * time.Second,
}
//
//if data.ExpType == string(TAG) {
// if data.ExpType == string(TAG) {
// pullRequest.SubVersion = 0
//} else {
// } else {
// pullRequest.SubVersion = data.SubVersion
//}
// }

brokerResult := pc.defaultConsumer.tryFindBroker(request.mq)
if brokerResult == nil {
Expand Down Expand Up @@ -954,31 +954,31 @@ func (pc *pushConsumer) resume() {
}

func (pc *pushConsumer) ResetOffset(topic string, table map[primitive.MessageQueue]int64) {
//topic := cmd.ExtFields["topic"]
//group := cmd.ExtFields["group"]
//if topic == "" || group == "" {
// topic := cmd.ExtFields["topic"]
// group := cmd.ExtFields["group"]
// if topic == "" || group == "" {
// rlog.Warning("received reset offset command from: %s, but missing params.", from)
// return
//}
//t, err := strconv.ParseInt(cmd.ExtFields["timestamp"], 10, 64)
//if err != nil {
// }
// t, err := strconv.ParseInt(cmd.ExtFields["timestamp"], 10, 64)
// if err != nil {
// rlog.Warning("received reset offset command from: %s, but parse time error: %s", err.Error())
// return
//}
//rlog.Infof("invoke reset offset operation from broker. brokerAddr=%s, topic=%s, group=%s, timestamp=%v",
// }
// rlog.Infof("invoke reset offset operation from broker. brokerAddr=%s, topic=%s, group=%s, timestamp=%v",
// from, topic, group, t)
//
//offsetTable := make(map[MessageQueue]int64, 0)
//err = json.Unmarshal(cmd.Body, &offsetTable)
//if err != nil {
// offsetTable := make(map[MessageQueue]int64, 0)
// err = json.Unmarshal(cmd.Body, &offsetTable)
// if err != nil {
// rlog.Warning("received reset offset command from: %s, but parse offset table: %s", err.Error())
// return
//}
//v, exist := c.consumerMap.Load(group)
//if !exist {
// }
// v, exist := c.consumerMap.Load(group)
// if !exist {
// rlog.Infof("[reset-offset] consumer dose not exist. group=%s", group)
// return
//}
// }
pc.suspend()
defer pc.resume()

Expand Down Expand Up @@ -1149,14 +1149,12 @@ func (pc *pushConsumer) consumeMessageConcurrently(pq *processQueue, mq *primiti
if err != nil {
rlog.Warning("consumeMessageCurrently error", map[string]interface{}{
rlog.LogKeyUnderlayError: err,
rlog.LogKeyMessages: msgs,
rlog.LogKeyMessageQueue: mq,
rlog.LogKeyConsumerGroup: pc.consumerGroup,
})
msgCtx.Properties[primitive.PropCtxType] = string(primitive.ExceptionReturn)
} else if consumeRT >= pc.option.ConsumeTimeout {
rlog.Warning("consumeMessageCurrently time out", map[string]interface{}{
rlog.LogKeyMessages: msgs,
rlog.LogKeyMessageQueue: mq,
rlog.LogKeyConsumerGroup: pc.consumerGroup,
})
Expand Down Expand Up @@ -1291,7 +1289,6 @@ func (pc *pushConsumer) consumeMessageOrderly(pq *processQueue, mq *primitive.Me
if err != nil {
rlog.Warning("consumeMessage orderly error", map[string]interface{}{
rlog.LogKeyUnderlayError: err,
rlog.LogKeyMessages: msgs,
rlog.LogKeyMessageQueue: mq.String(),
rlog.LogKeyConsumerGroup: pc.consumerGroup,
})
Expand All @@ -1307,15 +1304,15 @@ func (pc *pushConsumer) consumeMessageOrderly(pq *processQueue, mq *primitive.Me
}

// just put consumeResult in consumerMessageCtx
//interval = time.Now().Sub(beginTime)
//consumeReult := SuccessReturn
//if interval > pc.option.ConsumeTimeout {
// interval = time.Now().Sub(beginTime)
// consumeReult := SuccessReturn
// if interval > pc.option.ConsumeTimeout {
// consumeReult = TimeoutReturn
//} else if SuspendCurrentQueueAMoment == result {
// } else if SuspendCurrentQueueAMoment == result {
// consumeReult = FailedReturn
//} else if ConsumeSuccess == result {
// } else if ConsumeSuccess == result {
// consumeReult = SuccessReturn
//}
// }

// process result
commitOffset := int64(-1)
Expand Down
1 change: 0 additions & 1 deletion rlog/log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ const (
LogKeyStoreHost = "storeHost"
LogKeyQueueId = "queueId"
LogKeyQueueOffset = "queueOffset"
LogKeyMessages = "messages"
)

type Logger interface {
Expand Down
Loading