-
Notifications
You must be signed in to change notification settings - Fork 4
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.
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
Move over to the official bazel_worker implementation #68
Merged
Bencodes
merged 3 commits into
main
from
move-over-to-the-official-bazel_worker-implementation
Jan 21, 2025
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,125 +1,37 @@ | ||
| package com.rules.android.lint.worker | ||
|
|
||
| import io.reactivex.rxjava3.core.BackpressureStrategy | ||
| import io.reactivex.rxjava3.core.Flowable | ||
| import io.reactivex.rxjava3.core.Scheduler | ||
| import io.reactivex.rxjava3.schedulers.Schedulers | ||
| import java.io.BufferedOutputStream | ||
| import java.io.ByteArrayOutputStream | ||
| import com.google.devtools.build.lib.worker.ProtoWorkerMessageProcessor | ||
| import com.google.devtools.build.lib.worker.WorkRequestHandler | ||
| import java.io.IOException | ||
| import java.io.PrintStream | ||
| import java.time.Duration | ||
|
|
||
| internal class PersistentWorker( | ||
| /** | ||
| * WorkerIO instance wrapping the standard output streams | ||
| */ | ||
| private val workerIO: WorkerIO, | ||
| /** | ||
| * Rxjava Scheduler to execute work requests on. | ||
| */ | ||
| private val scheduler: Scheduler, | ||
| /** | ||
| * Instance of CpuTimeBasedGcScheduler that will run periodically | ||
| */ | ||
| private val persistentWorkerCpuTimeBasedGcScheduler: PersistentWorkerCpuTimeBasedGcScheduler, | ||
| /** | ||
| * Instance of CpuTimeBasedGcScheduler that will run periodically | ||
| */ | ||
| private val workRequestProcessor: Worker.WorkerMessageProcessor, | ||
| /** | ||
| * Instance of CpuTimeBasedGcScheduler that will run periodically | ||
| */ | ||
| private val workerWorkRequestCallback: Worker.WorkRequestCallback, | ||
| ) : Worker { | ||
| constructor( | ||
| workerMessageProcessor: Worker.WorkRequestCallback, | ||
| ) : this( | ||
| workerIO = WorkerIO(), | ||
| scheduler = Schedulers.io(), | ||
| persistentWorkerCpuTimeBasedGcScheduler = PersistentWorkerCpuTimeBasedGcScheduler(), | ||
| workRequestProcessor = | ||
| WorkerJsonMessageProcessor( | ||
| System.`in`, | ||
| System.out, | ||
| ), | ||
| workerWorkRequestCallback = workerMessageProcessor, | ||
| ) | ||
|
|
||
| /** | ||
| * Initiate the worker and begin processing work requests | ||
| */ | ||
| override fun processRequests(): Int { | ||
| return workerIO.use { io -> | ||
| // Start by redirecting the system streams so that nothing | ||
| // corrupts the streams that the worker uses | ||
| io.redirectSystemStreams() | ||
| val realStdErr: PrintStream = System.err | ||
|
|
||
| // Process requests as they come in using RxJava | ||
| Flowable | ||
| .create( | ||
| { emitter -> | ||
| while (!emitter.isCancelled) { | ||
| try { | ||
| val request: WorkRequest = workRequestProcessor.readWorkRequest() | ||
| emitter.onNext(request) | ||
| } catch (e: IOException) { | ||
| emitter.onError(e) | ||
| } | ||
| } | ||
| }, | ||
| BackpressureStrategy.BUFFER, | ||
| ).subscribeOn(scheduler) | ||
| .parallel() | ||
| .runOn(scheduler) | ||
| // Execute the work and map the result to a work response | ||
| .map { request -> return@map this.respondToRequest(request) } | ||
| // Run the garbage collector periodically so that we are a good responsible worker | ||
| .doOnNext { persistentWorkerCpuTimeBasedGcScheduler.maybePerformGc() } | ||
| .doOnError { it.printStackTrace() } | ||
| .sequential() | ||
| .observeOn(scheduler) | ||
| .blockingSubscribe { response -> | ||
| workRequestProcessor.writeWorkResponse(response) | ||
| } | ||
| return@use 0 | ||
| try { | ||
| val workerHandler: WorkRequestHandler = | ||
| WorkRequestHandler | ||
| .WorkRequestHandlerBuilder( | ||
| WorkRequestHandler.WorkRequestCallback { request, pw -> | ||
| return@WorkRequestCallback workerWorkRequestCallback.processWorkRequest( | ||
| request.argumentsList.toList(), | ||
| System.err, | ||
| ) | ||
| }, | ||
| realStdErr, | ||
| ProtoWorkerMessageProcessor(System.`in`, System.out), | ||
| ).setCpuUsageBeforeGc(Duration.ofSeconds(10)) | ||
| .build() | ||
| workerHandler.processRequests() | ||
| } catch (e: IOException) { | ||
| e.printStackTrace(realStdErr) | ||
| return 1 | ||
| } | ||
| } | ||
|
|
||
| private fun respondToRequest(request: WorkRequest): WorkResponse { | ||
| ByteArrayOutputStream().use { baos -> | ||
| // Create a print stream that the execution can write logs to | ||
| val printStream = PrintStream(BufferedOutputStream(ByteArrayOutputStream())) | ||
| var exitCode: Int | ||
| try { | ||
| // Sanity check the work request arguments | ||
| val arguments = | ||
| requireNotNull(request.arguments) { | ||
| "Request with id ${request.requestId} " + | ||
| "does not have arguments!" | ||
| } | ||
| require(arguments.isNotEmpty()) { | ||
| "Request with id ${request.requestId} " + | ||
| "does not have arguments!" | ||
| } | ||
| exitCode = workerWorkRequestCallback.processWorkRequest(arguments, printStream) | ||
| } catch (e: Exception) { | ||
| e.printStackTrace(printStream) | ||
| exitCode = 1 | ||
| } finally { | ||
| printStream.flush() | ||
| } | ||
|
|
||
| val output = | ||
| arrayOf(baos.toString()) | ||
| .asSequence() | ||
| .map { it.trim() } | ||
| .filter { it.isNotEmpty() } | ||
| .joinToString("\n") | ||
| return WorkResponse( | ||
| exitCode = exitCode, | ||
| output = output, | ||
| requestId = request.requestId, | ||
| ) | ||
| } | ||
| return 0 | ||
| } | ||
| } | ||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can I ask what the purpose of setting this is and why you chose 10 seconds specifically?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Copied this from the usages within Bazel core and their examples.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good, the PR looks good to me from my perspective.