Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Inputs should not call poll! after completed?. #867

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
25 changes: 14 additions & 11 deletions src/onyx/peer/read_batch.clj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
[onyx.types :as types]
[primitive-math :as pm]
[onyx.static.uuid :refer [random-uuid]]
[onyx.static.util :refer [ns->ms ms->ns]]
[taoensso.timbre :as timbre :refer [debug info]])
(:import [java.util.concurrent.locks LockSupport]
[org.agrona.concurrent IdleStrategy]
Expand Down Expand Up @@ -38,6 +37,9 @@
(set-event! (assoc (get-event state) :onyx.core/batch batch))
(advance))))

(defn ns->ms [^long ns]
(pm// ns 1000000))

(defn read-input-batch [state batch-size batch-timeout-ns max-segments-per-barrier since-barrier-count]
(let [pipeline (get-input-pipeline state)
event (get-event state)
Expand All @@ -46,16 +48,17 @@
(pm/- ^long max-segments-per-barrier
(.get ^AtomicLong since-barrier-count)))
end-time (pm/+ (System/nanoTime) ^long batch-timeout-ns)
_ (loop [remaining batch-timeout-ns
n 0]
(when (and (pm/< n batch-size-rest)
(pos? remaining))
(let [remaining-ms (pm// ^long remaining 1000000)
segment (p/poll! pipeline event remaining-ms)]
(when-not (nil? segment)
(conj! outgoing segment)
(recur (pm/- end-time (System/nanoTime))
(pm/inc n))))))
_ (if (p/completed? pipeline)
outgoing
(loop [remaining batch-timeout-ns
n 0]
(when (and (pm/< n batch-size-rest)
(pos? remaining))
(let [segment (p/poll! pipeline event (ns->ms remaining))]
(when-not (nil? segment)
(conj! outgoing segment)
(recur (pm/- end-time (System/nanoTime))
(pm/inc n)))))))
batch (persistent! outgoing)]
(.addAndGet ^AtomicLong since-barrier-count (count batch))
(-> state
Expand Down