xiaokang commented on code in PR #44999:
URL: https://github.com/apache/doris/pull/44999#discussion_r1926771335
##########
extension/logstash/lib/logstash/outputs/doris.rb:
##########
@@ -72,6 +73,8 @@ class LogStash::Outputs::Doris < LogStash::Outputs::Base
config :log_progress_interval, :validate => :number, :default => 10
+ # max retry queue size in MB, default is the half max memory of JVM
Review Comment:
50% is too large, 20% is enough
##########
extension/logstash/lib/logstash/outputs/doris.rb:
##########
@@ -72,6 +73,8 @@ class LogStash::Outputs::Doris < LogStash::Outputs::Base
config :log_progress_interval, :validate => :number, :default => 10
+ # max retry queue size in MB, default is the half max memory of JVM
+ config :max_retry_queue_size, :validate => :number, :default =>
java.lang.Runtime.get_runtime.max_memory / 1024 / 1024 / 2
Review Comment:
max_retry_queue_mb
##########
extension/logstash/lib/logstash/util/delay_event.rb:
##########
@@ -0,0 +1,51 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+require 'java'
+
+class DelayEvent
+ include java.util.concurrent.Delayed
+
+ def initialize(delay, event)
+ @start_time = Time.now.to_i + delay
+ @event = event # event style: [documents, http_headers, event_num,
req_count]
+ end
+
+ def get_delay(unit)
+ delay = @start_time - Time.now.to_i
+ unit.convert(delay, java.util.concurrent.TimeUnit::SECONDS)
+ end
+
+def compare_to(other)
+ d = self.get_delay(java.util.concurrent.TimeUnit::SECONDS) -
other.get_delay(java.util.concurrent.TimeUnit::SECONDS)
Review Comment:
you can just compare @start_time
##########
extension/logstash/lib/logstash/outputs/doris.rb:
##########
@@ -157,50 +183,66 @@ def send_events(events)
http_headers["label"] = @label_prefix + "_" + @db + "_" + @table +
"_" + Time.now.strftime('%Y%m%d_%H%M%S_%L_' + SecureRandom.uuid)
end
- req_count = 0
- sleep_for = 1
- while true
- response = make_request(documents, http_headers, @http_query,
@http_hosts.sample)
-
- req_count += 1
- response_json = {}
- begin
- response_json = JSON.parse(response.body)
- rescue => e
- @logger.warn("doris stream load response: #{response} is not a
valid JSON")
- end
+ handle_request(documents, http_headers, event_num, 1)
+ end
+
+ def sleep_for_attempt(attempt)
+ sleep_for = attempt**2
+ sleep_for = sleep_for <= 60 ? sleep_for : 60
+ (sleep_for/2) + (rand(0..sleep_for)/2)
+ end
+
+ private
+ def handle_request(documents, http_headers, event_num, req_count)
+ response = make_request(documents, http_headers, @http_query,
@http_hosts.sample)
+ response_json = {}
+ begin
+ response_json = JSON.parse(response.body)
+ rescue => _
+ @logger.warn("doris stream load response is not a valid
JSON:\n#{response}")
+ end
+
+ status = response_json["Status"]
+
+ need_retry = true
- status = response_json["Status"]
+ if status == 'Label Already Exists'
+ @logger.warn("Label already exists: #{response_json['Label']}, skip
#{event_num} records:\n#{response}")
+ need_retry = false
- if status == 'Label Already Exists'
- @logger.warn("Label already exists: #{response_json['Label']}, skip
#{event_num} records.")
- break
+ elsif status == "Success" || status == "Publish Timeout"
+ @total_bytes.addAndGet(documents.size)
+ @total_rows.addAndGet(event_num)
+ if @log_request or @logger.debug?
+ @logger.info("doris stream load response:\n#{response}")
end
+ need_retry = false
+
+ # if there are data quality issues, we do not retry
Review Comment:
It's not reasonable.
##########
extension/logstash/lib/logstash/outputs/doris.rb:
##########
@@ -131,22 +134,45 @@ def register
end
end
+ if @max_retry_queue_size <= 0
+ @max_retry_queue_size = java.lang.Runtime.get_runtime.max_memory /
1024 / 1024 / 2
+ end
+ @logger.info("max retry queue size: #{@max_retry_queue_size}MB")
+
+ @retry_queue = java.util.concurrent.DelayQueue.new
+ # retry queue size in bytes
+ @retry_queue_bytes = java.util.concurrent.atomic.AtomicLong.new(0)
+ retry_thread = Thread.new do
+ while popped = @retry_queue.take
+ documents, http_headers, event_num, req_count = popped.event
+ handle_request(documents, http_headers, event_num, req_count)
+ end
+ end
+
print_plugin_info()
end # def register
+ private
+ def add_event_to_retry_queue(delay_event)
+ event_size = delay_event.documents.size
+ if delay_event.first_retry
Review Comment:
It's not necessary to check first_retry.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
