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

Jump to bottom

aggr: ensure publisher future completes #400

Merged
merged 1 commit into from
Mar 7, 2023
Merged

aggr: ensure publisher future completes #400

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
4 changes: 4 additions & 0 deletions atlas-aggregator/src/main/resources/application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ atlas.aggregator {
}
]

publisher {
queue-size = 10000
}

// Determines whether or not to include the aggregator node as a tag on counters.
// If false it will use atlas.dstype=sum instead.
include-aggr-tag = false
Expand Down
2 changes: 1 addition & 1 deletion atlas-aggregator/src/main/scala/com/netflix/atlas/aggregator/AggrConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import com.netflix.spectator.impl.Cache
import com.typesafe.config.Config

class AggrConfig(
config: Config,
val config: Config,
registry: Registry,
system: ActorSystem
) extends AtlasConfig
Expand Down
17 changes: 12 additions & 5 deletions atlas-aggregator/src/main/scala/com/netflix/atlas/aggregator/AkkaPublisher.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ class AkkaPublisher(registry: Registry, config: AggrConfig, implicit val system:
private val ec: ExecutionContext =
ThreadPools.fixedSize(registry, "PublishEncoding", encodingParallelism)

private val pubConfig = config.config.getConfig("atlas.aggregator.publisher")
private val queueSize = pubConfig.getInt("queue-size")

private val atlasClient = createClient("publisher-atlas")
private val lwcClient = createClient("publisher-lwc")

Expand All @@ -96,7 +99,7 @@ class AkkaPublisher(registry: Registry, config: AggrConfig, implicit val system:
flow
}
StreamOps
.blockingQueue[RequestTuple](config.debugRegistry(), name, 1000)
.blockingQueue[RequestTuple](config.debugRegistry(), name, queueSize)
.via(restartFlow)
.toMat(Sink.ignore)(Keep.left)
.run()
Expand All @@ -106,14 +109,18 @@ class AkkaPublisher(registry: Registry, config: AggrConfig, implicit val system:

override def publish(payload: PublishPayload): CompletableFuture[Void] = {
val t = new RequestTuple(atlasUri, "publisher-atlas", payload)
atlasClient.offer(t)
t.future
if (atlasClient.offer(t))
CompletableFuture.completedFuture(VoidInstance)
else
CompletableFuture.failedFuture(new IllegalStateException("failed to enqueue atlas request"))
}

override def publish(payload: EvalPayload): CompletableFuture[Void] = {
val t = new RequestTuple(evalUri, "publisher-lwc", payload)
lwcClient.offer(t)
t.future
if (lwcClient.offer(t))
CompletableFuture.completedFuture(VoidInstance)
else
CompletableFuture.failedFuture(new IllegalStateException("failed to enqueue lwc request"))
}

override def close(): Unit = {
Expand Down