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.

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

https://github.com/opensearch-project/job-scheduler/pull/351 #349

Merged
merged 1 commit into from
Mar 27, 2023
Merged

Conversation

joshpalis
Copy link
Member

@joshpalis joshpalis commented Mar 24, 2023

Description

Coming from modifications to the ExtensionProxyAction workflow here.

The JobDetailsService used to facilitate job execution for extensions creates proxy ScheduledJobRunner and ScheduledJobParser objects that utilize the node client to execute remote extension actions.

Here is an example of the new workflow :

  1. An extension registers its Job Details and Job Scheduler creates a ScheduledJobProvider, which contains a ScheduledJobParser that delegates parsing of the extension job index entry to the extension by executing the extension parse action
  2. Job Scheduler is notified of an index operation on the extension job index, pulls that entry and it's proxy ScheduledJobParser invokes ExtensionProxyAction to send this to the extension to parse
  3. The ExtensionProxyJobAction attaches the fully qualified class name of the ExtensionActionRequest as bytes in the responseByte field, along with the bytes provided by the inner JobParserRequest that contains the job index entry source
  4. This request is sent to the SDK's REQUEST_EXTENSION_HANDLE_TRANSPORT_ACTION handler
  5. This request is then handled by the ExtensionActionRequestHandler here, which delegates the request handling to the handleRemoteExtensionActionRequest method.
  6. Within this method, the requestBytes are processed and the request class name is identified here which is used to identify and create the constructor for this particular ActionRequest
  7. The action is then executed using the SDKClient and this request is forwarded to the corresponding TransportAction
  8. The response is then sent back to Job Scheduler

This PR ensures that request bytes for the ExtensionActionRequest sent from Job Scheduler are in the correct format to be processed by the SDK.

Check List

  • New functionality includes testing.
    • All tests pass
  • New functionality has been documented.
    • New functionality has javadoc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@codecov-commenter
Copy link

codecov-commenter commented Mar 24, 2023

Codecov Report

Merging #349 (9b77de8) into main (00bd2d4) will decrease coverage by 0.42%.
The diff coverage is 0.00%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@             Coverage Diff              @@
##               main     #349      +/-   ##
============================================
- Coverage     29.12%   28.70%   -0.42%     
  Complexity       97       97              
============================================
  Files            23       23              
  Lines          1171     1188      +17     
  Branches        109      110       +1     
============================================
  Hits            341      341              
- Misses          809      826      +17     
  Partials         21       21              
Impacted Files Coverage Δ
...r/transport/request/ExtensionJobActionRequest.java 0.00% <0.00%> (ø)
...heduler/transport/request/JobParameterRequest.java 0.00% <0.00%> (ø)
...bscheduler/transport/request/JobRunnerRequest.java 0.00% <0.00%> (ø)
...transport/response/ExtensionJobActionResponse.java 0.00% <0.00%> (ø)
...ensearch/jobscheduler/utils/JobDetailsService.java 2.57% <ø> (+0.05%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Member

@dbwiddis dbwiddis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM for working code.

But I see multiple copies of the same utility code for parsing byte arrays associated with these remote calls, and they should probably find a home in ExtensionTransportAction or maybe a new ExtensionTransportUtil class.

OK to merge this as is but if anyone else thinks like I do let's make an issue to do this.


/**
* Request to extensions to invoke a job action, converts request params to a byte array
*
*/
public class ExtensionJobActionRequest<T extends Writeable> extends ExtensionActionRequest {

public static final byte UNIT_SEPARATOR = (byte) '\u001F';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should make this a constant in the ExtensionTransportAction.

* @param value the byte to identify index of
* @return the index of the byte value
*/
private static int indexOf(byte[] bytes, byte value) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if we should make this a util method in ExtensionTransportAction

* @return the trimmed array of bytes
*/
public static byte[] trimRequestBytes(byte[] requestBytes) {
int nullPos = indexOf(requestBytes, ExtensionJobActionRequest.UNIT_SEPARATOR);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that nullPos was left over from when this was a null byte, and maybe should just be a pos.

// Write inner request to output stream and convert to byte array
BytesStreamOutput out = new BytesStreamOutput();
actionParams.writeTo(out);
out.flush();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used to always do this, but this is the method being invoked:

    @Override
    public void flush() {
        // nothing to do
    }

* @throws IOException if serialization fails
* @return the byte array of the parameters
*/
private static <T extends Writeable> byte[] convertParamsToBytes(T actionParams) throws IOException {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this should be a util method on ExtensionActionRequest or ExtensionTransportAction

* @throws IOException if serialization fails
* @return the byte array of the parameters
*/
private static <T extends Writeable> byte[] convertParamsToBytes(T actionParams) throws IOException {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deja vu. We definitely should find a central location for these util classes that both Extensions and Plugins can use.

@joshpalis
Copy link
Member Author

@dbwiddis I agree, lets move these methods over to ExtensionActionRequest/ExtensionTransportAction. For now lets merge this change in until opensearch-project/opensearch-sdk-java#607 is resolved. Once those utilities are available then I'll make the change to Job Scheduler to use those instead.

@vibrantvarun
Copy link
Member

LGTM!

@joshpalis joshpalis merged commit 9d6e976 into opensearch-project:main Mar 27, 2023
@joshpalis joshpalis deleted the proxy branch March 27, 2023 19:18
@joshpalis joshpalis changed the title [Extensions] Fixes serde logic for proxy scheduled jobrunner/parser requests/responses https://github.com/opensearch-project/job-scheduler/pull/351 Mar 27, 2023
vibrantvarun added a commit that referenced this pull request May 10, 2023
…#382)

* Communication mechanism for js (#289)

* Job Details from Extension for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Commnunication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Commnunication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Commnunication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Commnunication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Commnunication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Commnunication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

* Communication Mechanism for JS

Signed-off-by: Varun Jain <[email protected]>

Signed-off-by: Varun Jain <[email protected]>

* [Extensions] Synchronize opensearch-plugin-job-details with JobDetailsService map (#299)

* Added JobDetailsService as an indexOperationListener to synchronize metadata index with internal job details m and indicesToListen set.

Signed-off-by: Joshua Palis <[email protected]>

* Changes indexToJobDetails to a ConcurrentMap, adds getter method for indexToJobDetails

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments, fixing log message

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments

Signed-off-by: Joshua Palis <[email protected]>

* Added test to updateIndexToJobDetails

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments, changing extensionId to extensionUniqueId

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR Comments : Updating Job Details index Name and mapping file to opensearch-job-scheduler-job-details

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments, enabling extensions to submit more than 1 job details entry to support extensions registering multiple types of jobs, updated all integration, multinode tests now that the rest response value is the document Id

Signed-off-by: Joshua Palis <[email protected]>

* Renaming TestHelper base URI name

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments, made multinode test request strings constant

Signed-off-by: Joshua Palis <[email protected]>

Signed-off-by: Joshua Palis <[email protected]>

* [Extensions] Create a proxy ScheduledJobRunner, ScheduledJobParser to invoke corresponding registered Job Detail actions (#306)

* Draft : Added JobParameterRequest to translate ScheduledJobParser parameters nto compatible inputs for the ExtensionActionRequest. Completed initial proxy scheduled job parser implementation. Added ExtensionJobParameter class to deserialize ExtensionActionResponsebyte array into an object of type ScheduledJobParameter

Signed-off-by: Joshua Palis <[email protected]>

* Added JobRunnerRequest, modified JobExecutionContext to implement writeable, created initial proxy ScheduledJobRunner, fixed failing tests

Signed-off-by: Joshua Palis <[email protected]>

* Added generic ExtensionJobActionRequest that extends ExtensionActionRequest, modified JobParameter/Runner request to implement writeable, refactored proxy object creation so that the requests are added to the ExtensionJobActionRequest, which in turn upcasts the request into an ExtensionActionRequest

Signed-off-by: Joshua Palis <[email protected]>

* Added byte array constructors for the JobRunner/Parameter requests, added javadocs

Signed-off-by: Joshua Palis <[email protected]>

* Fixing javadocs

Signed-off-by: Joshua Palis <[email protected]>

* Fixing javadocs

Signed-off-by: Joshua Palis <[email protected]>

* Added placeholder string for an eventual access token to be sent to extensions to validate prior to invoking an action

Signed-off-by: Joshua Palis <[email protected]>

* Added ExtensionJobActionResponse, JobParameterResponse, JobRunnerResponse to facilitate the response of extension actions

Signed-off-by: Joshua Palis <[email protected]>

* Fixing javadocs

Signed-off-by: Joshua Palis <[email protected]>

* Added JobRunnerResponse handling

Signed-off-by: Joshua Palis <[email protected]>

* Separating updateIndexToJobProviders into separate methods

Signed-off-by: Joshua Palis <[email protected]>

* Fixing javadocs

Signed-off-by: Joshua Palis <[email protected]>

* SpotlessApply

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments

Signed-off-by: Joshua Palis <[email protected]>

* Added tests for serialization/deserialization of JobExecutionContext, JobDocVersion, ExtensionJobParameter, ExtensionJobActionRequest, ExtensionJobActionResponse, JobRunner/JobParameter/Request/Response

Signed-off-by: Joshua Palis <[email protected]>

* Writing ExtensionActionRequest/Response to bytestream output to test deserialization

Signed-off-by: Joshua Palis <[email protected]>

* Fixing imports

Signed-off-by: Joshua Palis <[email protected]>

* Changing to extensionActionResponse constructor

Signed-off-by: Joshua Palis <[email protected]>

* Adding tests for updateIndexToJobProviders

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments, added getters for lock duration seconds and jitter values, added javadocs to ScheduleType enum and made this public

Signed-off-by: Joshua Palis <[email protected]>

* Removing Strings dependency from lock model to fix BWC tests

Signed-off-by: Joshua Palis <[email protected]>

* Fixes BWC fullRestartClusterTask, rollingUpgradeClusterTask, oldVersionCluster task. mixedClusterTask is still failing

Signed-off-by: Joshua Palis <[email protected]>

* Modified createProxyScheduledJobRunner to return the document Id of the extension job parameter entry within the registered job index, modifed the ExtensionJobParameter to null check the jitter value and setting this to 0.0 if null

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>

* [Extensions] Exposes a GetLock REST API to enable extensions to acquire a lock model for their job execution (#311)

* Added RestGetLockAction API, added AcquireLockRequest, enables extensions to retrieve a lock model object to run their Job

Signed-off-by: Joshua Palis <[email protected]>

* Adding Lock ID field to RestGetLockAction response

Signed-off-by: Joshua Palis <[email protected]>

* Added multi node integration tests for GetLockApi

Signed-off-by: Joshua Palis <[email protected]>

* Making lock service in RestGetLockAction private

Signed-off-by: Joshua Palis <[email protected]>

* Added Rest integration tests for RestGetLockAction

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments

Signed-off-by: Joshua Palis <[email protected]>

* Updating get lock rest path in tests

Signed-off-by: Joshua Palis <[email protected]>

* Addressing PR comments

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>

* Communication Mechanism Work Item 6 Release lock api (#312)

* Release lock API

Signed-off-by: Varun Jain <[email protected]>

* Release Lock API

Signed-off-by: Varun Jain <[email protected]>

* Release Lock API

Signed-off-by: Varun Jain <[email protected]>

* Release Lock API

Signed-off-by: Varun Jain <[email protected]>

* Reformatting

Signed-off-by: Varun Jain <[email protected]>

* Reformatting

Signed-off-by: Varun Jain <[email protected]>

* Reformatting

Signed-off-by: Varun Jain <[email protected]>

* Addressing Dan's Comments

Signed-off-by: Varun Jain <[email protected]>

* Addressing Dan's Comments

Signed-off-by: Varun Jain <[email protected]>

* Addressing Sarat's Comments

Signed-off-by: Varun Jain <[email protected]>

* Addressing Sarat's Comments

Signed-off-by: Varun Jain <[email protected]>

* Fixing test cases

Signed-off-by: Varun Jain <[email protected]>

* Fixing test cases

Signed-off-by: Varun Jain <[email protected]>

* Fixing ReleaseLocktestcase

Signed-off-by: Varun Jain <[email protected]>

* Fixing ReleaseLocktestcase

Signed-off-by: Varun Jain <[email protected]>

---------

Signed-off-by: Varun Jain <[email protected]>

* Bumping BWC version to 2.7 and Fixing xcontent imports (#322)

* [Extensions] Add all fields of LockModel to RestGetLockAction response (#342)

* Modifies the RestGetLockAction response to include all fields of the lock model object, rather than the lock model object itself

Signed-off-by: Joshua Palis <[email protected]>

* Removing unused fields

Signed-off-by: Joshua Palis <[email protected]>

* reverting field removal

Signed-off-by: Joshua Palis <[email protected]>

* Adding lockID to back to response

Signed-off-by: Joshua Palis <[email protected]>

* Adding checks to multinode get lock rest integration tests to ensure that all response fields are populated

Signed-off-by: Joshua Palis <[email protected]>

* fixing lock time parsing

Signed-off-by: Joshua Palis <[email protected]>

* Adds a new Response class to house serde logic for RestGetLockAction response

Signed-off-by: Joshua Palis <[email protected]>

* Moving parser.nextToken() within AcquireLockResponse.parse()

Signed-off-by: Joshua Palis <[email protected]>

* Implementing toXContentObject for AcquireLockRequest

Signed-off-by: Joshua Palis <[email protected]>

* Moving AcquireLockResponse to transpor package

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>

* Increasing JobDetailsService request timeoufrom 10 to 15, since the initial job detail registration request will initialize the job details metadata index, which takes some time (#346)

Signed-off-by: Joshua Palis <[email protected]>

* Fixes serde logic for proxy scheduled jobrunner/parser requests/responses (#349)

Signed-off-by: Joshua Palis <[email protected]>

* Fixes serde logic for JobParameterRequest/JobRunnerRequest. Removes extra trimming of request bytes for the streaminput constructor for the JobParameter/RunnerRequest, as this is already trimmed by the SDK prior to forwarding the actionrequest to the transport action (#351)

Signed-off-by: Joshua Palis <[email protected]>

* [Extensions] Makes JobRunner/Parameter/Request/Response classes extend from ActionRequest/Response (#352)

* Replaces ExtensionActionRequest class name with the JobParameter/RunnerRequest fully qualified class names, modifes JobParameter/Runner/Request/Response classes to extend from ActionRequest/Response

Signed-off-by: Joshua Palis <[email protected]>

* Removes ExtensionJobActionResponse and fixes affected test classes

Signed-off-by: Joshua Palis <[email protected]>

* Fixing javadocs

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Joshua Palis <[email protected]>

* Consuming breaking changes from moving ExtensionActionRequest (#381)

Signed-off-by: Sarat Vemulapalli <[email protected]>

* spotless

Signed-off-by: Joshua Palis <[email protected]>

* Fixing apache imports for TestHelpers class

Signed-off-by: Joshua Palis <[email protected]>

* Modofies ODFERestTestCase to work with 2.x

Signed-off-by: Joshua Palis <[email protected]>

* Fixing wipeAllODFEIndices

Signed-off-by: Joshua Palis <[email protected]>

---------

Signed-off-by: Varun Jain <[email protected]>
Signed-off-by: Joshua Palis <[email protected]>
Signed-off-by: Sarat Vemulapalli <[email protected]>
Co-authored-by: Varun Jain <[email protected]>
Co-authored-by: Sarat Vemulapalli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants