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

Communication mechanism for js #289

Merged
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
7b23218
Job Details from Extension for JS
vibrantvarun Dec 27, 2022
ecb3462
Communication Mechanism for JS
vibrantvarun Dec 28, 2022
692d659
Communication mechanism for JS
vibrantvarun Dec 29, 2022
97e783b
Communication mechanism for JS
vibrantvarun Dec 29, 2022
b97d08a
Communication mechanism for JS
vibrantvarun Dec 29, 2022
92e5a15
Communication mechanism for JS
vibrantvarun Dec 29, 2022
da64ca7
Commnunication Mechanism for JS
vibrantvarun Dec 29, 2022
5eb8dc5
Commnunication Mechanism for JS
vibrantvarun Dec 29, 2022
21dfd75
Commnunication Mechanism for JS
vibrantvarun Dec 30, 2022
15e9e2e
Commnunication Mechanism for JS
vibrantvarun Dec 30, 2022
c9933e6
Commnunication Mechanism for JS
vibrantvarun Dec 30, 2022
ff9e493
Commnunication Mechanism for JS
vibrantvarun Dec 30, 2022
7933c4e
Commnunication Mechanism for JS
vibrantvarun Dec 30, 2022
37c8d0d
Communication Mechanism for JS
vibrantvarun Jan 3, 2023
7879155
Commnunication Work for JS
vibrantvarun Jan 3, 2023
1367c02
Communication Mechanism for JS
vibrantvarun Jan 3, 2023
a27c263
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
f4e36f0
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
0b62209
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
fac7c69
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
1494680
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
dbc9382
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
6796447
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
eb1ccb6
Merge branch 'main' of https://github.com/opensearch-project/job-sche…
vibrantvarun Jan 5, 2023
3ef8a3c
Merge branch 'main' into Communication_Mechanism_For_JS
vibrantvarun Jan 5, 2023
b726e5c
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
a123089
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
d6bea89
Communication Mechanism for JS
vibrantvarun Jan 5, 2023
3613ec8
Communication Mechanism for JS
vibrantvarun Jan 6, 2023
9a881dc
Communication Mechanism for JS
vibrantvarun Jan 6, 2023
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
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,8 @@ repositories {

dependencies {
implementation project(path: ":${rootProject.name}-spi", configuration: 'shadow')
implementation group: 'com.google.guava', name: 'guava', version:'31.0.1-jre'
implementation group: 'com.google.guava', name: 'failureaccess', version:'1.0.1'
javaRestTestImplementation project.sourceSets.main.runtimeClasspath
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,17 @@
*/
package org.opensearch.jobscheduler;

import org.opensearch.action.ActionRequest;
import org.opensearch.action.ActionResponse;
import org.opensearch.cluster.node.DiscoveryNodes;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.settings.ClusterSettings;
import org.opensearch.common.settings.IndexScopedSettings;
import org.opensearch.common.settings.SettingsFilter;
import org.opensearch.jobscheduler.model.JobDetails;
import org.opensearch.jobscheduler.rest.RestGetJobIndexAction;
import org.opensearch.jobscheduler.rest.RestGetJobTypeAction;
import org.opensearch.jobscheduler.scheduler.JobScheduler;
import org.opensearch.jobscheduler.spi.JobSchedulerExtension;
import org.opensearch.jobscheduler.spi.ScheduledJobParser;
Expand All @@ -23,35 +34,43 @@
import org.opensearch.cluster.service.ClusterService;
import org.opensearch.common.ParseField;
import org.opensearch.common.io.stream.NamedWriteableRegistry;
import org.opensearch.common.settings.Setting;
import org.opensearch.common.settings.Settings;
import org.opensearch.common.util.concurrent.OpenSearchExecutors;
import org.opensearch.common.xcontent.NamedXContentRegistry;
import org.opensearch.env.Environment;
import org.opensearch.env.NodeEnvironment;
import org.opensearch.index.IndexModule;
import org.opensearch.jobscheduler.transport.GetJobIndexAction;
import org.opensearch.jobscheduler.transport.GetJobIndexTransportAction;
import org.opensearch.jobscheduler.transport.GetJobTypeAction;
import org.opensearch.jobscheduler.transport.GetJobTypeTransportAction;
import org.opensearch.plugins.ActionPlugin;
import org.opensearch.plugins.ExtensiblePlugin;
import org.opensearch.plugins.Plugin;
import org.opensearch.repositories.RepositoriesService;
import org.opensearch.rest.RestController;
import org.opensearch.script.ScriptService;
import org.opensearch.threadpool.ExecutorBuilder;
import org.opensearch.threadpool.FixedExecutorBuilder;
import org.opensearch.threadpool.ThreadPool;
import org.opensearch.watcher.ResourceWatcherService;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Arrays;
import java.util.ArrayList;
import java.util.function.Supplier;

public class JobSchedulerPlugin extends Plugin implements ExtensiblePlugin {
import com.google.common.collect.ImmutableList;

public class JobSchedulerPlugin extends Plugin implements ActionPlugin, ExtensiblePlugin {

public static final String OPEN_DISTRO_JOB_SCHEDULER_THREAD_POOL_NAME = "open_distro_job_scheduler";
public static final String JS_BASE_URI = "/_plugins/_job_scheduler";

private static final Logger log = LogManager.getLogger(JobSchedulerPlugin.class);

Expand All @@ -60,10 +79,12 @@ public class JobSchedulerPlugin extends Plugin implements ExtensiblePlugin {
private LockService lockService;
private Map<String, ScheduledJobProvider> indexToJobProviders;
private Set<String> indicesToListen;
private Map<String, JobDetails> jobDetailsHashMap;

public JobSchedulerPlugin() {
this.indicesToListen = new HashSet<>();
this.indexToJobProviders = new HashMap<>();
this.jobDetailsHashMap = new HashMap<>();
dbwiddis marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
Expand Down Expand Up @@ -185,4 +206,27 @@ private JobSweeper initSweeper(
) {
return new JobSweeper(settings, client, clusterService, threadPool, registry, this.indexToJobProviders, scheduler, lockService);
}

@Override
public List getRestHandlers(
Settings settings,
RestController restController,
ClusterSettings clusterSettings,
IndexScopedSettings indexScopedSettings,
SettingsFilter settingsFilter,
IndexNameExpressionResolver indexNameExpressionResolver,
Supplier<DiscoveryNodes> nodesInCluster
) {
RestGetJobIndexAction restGetJobIndexAction = new RestGetJobIndexAction(jobDetailsHashMap);
RestGetJobTypeAction restGetJobTypeAction = new RestGetJobTypeAction(jobDetailsHashMap);
return ImmutableList.of(restGetJobIndexAction, restGetJobTypeAction);
}

@Override
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
return Arrays.asList(
new ActionHandler<>(GetJobIndexAction.INSTANCE, GetJobIndexTransportAction.class),
new ActionHandler<>(GetJobTypeAction.INSTANCE, GetJobTypeTransportAction.class)
);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
package org.opensearch.jobscheduler.constant;

public class CommonValue {

public static String EXTERNAL_ACTION_PREFIX = "cluster:admin/opendistro/js/";
Copy link
Member

Choose a reason for hiding this comment

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

Why opendistro?

Copy link
Member Author

@vibrantvarun vibrantvarun Dec 30, 2022

Choose a reason for hiding this comment

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

I see, I am changing it to plugins. The reason to change as suggested by @saratvemulapalli is

opendistro is part of ODFE: https://opendistro.github.io/for-elasticsearch/ which end of life.
AD security features were built in ODFE which is why it has legacy code

}
164 changes: 164 additions & 0 deletions src/main/java/org/opensearch/jobscheduler/model/JobDetails.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
package org.opensearch.jobscheduler.model;

import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.ToXContentObject;
import org.opensearch.common.xcontent.XContentBuilder;
import org.opensearch.common.xcontent.XContentParser;

import java.io.IOException;
import java.util.Objects;

import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;

/**
* This model class stores the job details of the extension.
*/
public class JobDetails implements ToXContentObject {
joshpalis marked this conversation as resolved.
Show resolved Hide resolved

private String jobIndex;

private String jobType;

private String jobParserAction;

private String jobRunnerAction;

public static final String JOB_INDEX = "job_index";
public static final String JOB_TYPE = "job_type";
public static final String JOB_PARSER_ACTION = "job_parser_action";
public static final String JOB_RUNNER_ACTION = "job_runner_action";

public JobDetails() {}

public JobDetails(String jobIndex, String jobType, String jobParserAction, String jobRunnerAction) {
this.jobIndex = jobIndex;
this.jobType = jobType;
this.jobParserAction = jobParserAction;
this.jobRunnerAction = jobRunnerAction;
}

@Override
public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException {
XContentBuilder xContentBuilder = builder.startObject();
if (jobIndex != null) {
Copy link
Member

Choose a reason for hiding this comment

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

Trying to understand, a. do we need to check if they are null?
b. And would they be ever null?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes we do have to check if they are null or not as while testing if we provide no value then it should handle that test case gracefully.

Copy link
Member Author

Choose a reason for hiding this comment

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

When the api call will be made then the job index will never be null.

Copy link
Member Author

Choose a reason for hiding this comment

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

ACK

xContentBuilder.field(JOB_INDEX, jobIndex);
}
if (jobType != null) {
xContentBuilder.field(JOB_TYPE, jobType);
}
if (jobParserAction != null) {
xContentBuilder.field(JOB_PARSER_ACTION, jobParserAction);
}
if (jobRunnerAction != null) {
xContentBuilder.field(JOB_RUNNER_ACTION, jobRunnerAction);
}
return xContentBuilder.endObject();
Copy link
Member

Choose a reason for hiding this comment

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

Nulls are dangerous and usually best avoided. Personal preference is to try to use Optional instead. I can be convinced to stick with null but will ask for it to be amply documented in that case.

Looking at all the classes in this PR, it seems that we always require jobType to be non-null, but the other values are allowed to be null. That isn't obvious from looking at this class in isolation. I suggest:

  1. Test the value of jobType before returning here, and throw an appropriate parsing exception here if it is null.
  2. Add the @Nullable annotation to the getters for the other three fields.
  3. Add the @Nullable annotation to each of the (allowed to be null) parameters on the constructor.
  4. Add a javadoc somewhere (perhaps the class itself, or this parsing method) indicating the allowed/disallowed nulls.

Copy link
Member Author

Choose a reason for hiding this comment

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

done

}

public static JobDetails parse(XContentParser parser) throws IOException {
String jobIndex = null;
String jobType = null;
String jobParserAction = null;
String jobRunnerAction = null;

ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.currentToken(), parser);

while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
String fieldName = parser.currentName();
parser.nextToken();
switch (fieldName) {
case JOB_INDEX:
jobIndex = parser.text();
break;
case JOB_TYPE:
jobType = parser.text();
break;
case JOB_PARSER_ACTION:
jobParserAction = parser.text();
break;
case JOB_RUNNER_ACTION:
jobRunnerAction = parser.text();
break;
default:
parser.skipChildren();
break;
}
}

return new JobDetails(jobIndex, jobType, jobParserAction, jobRunnerAction);
}

public String getJobIndex() {
return jobIndex;
}

public void setJobIndex(String jobIndex) {
this.jobIndex = jobIndex;
}

public String getJobType() {
return jobType;
}

public void setJobType(String jobType) {
this.jobType = jobType;
}

public String getJobParserAction() {
return jobParserAction;
}

public void setJobParserAction(String jobParserAction) {
this.jobParserAction = jobParserAction;
}

public String getJobRunnerAction() {
return jobRunnerAction;
}

public void setJobRunnerAction(String jobRunnerAction) {
this.jobRunnerAction = jobRunnerAction;
}

@Override
public boolean equals(Object o) {
if (this == o) return true;
if (o == null || getClass() != o.getClass()) return false;
JobDetails that = (JobDetails) o;
return Objects.equals(jobIndex, that.jobIndex)
&& Objects.equals(jobType, that.jobType)
&& jobParserAction.equals(that.jobParserAction)
dbwiddis marked this conversation as resolved.
Show resolved Hide resolved
&& jobRunnerAction.equals(that.jobRunnerAction);
}

@Override
public int hashCode() {
return Objects.hash(jobIndex, jobType, jobParserAction, jobRunnerAction);
}

@Override
public String toString() {
return "JobDetails{"
+ "jobIndex='"
+ jobIndex
+ '\''
+ ", jobType='"
+ jobType
+ '\''
+ ", jobParserAction='"
+ jobParserAction
+ '\''
+ ", jobRunnerAction='"
+ jobRunnerAction
+ '\''
+ '}';
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*
* The OpenSearch Contributors require contributions made to
* this file be licensed under the Apache-2.0 license or a
* compatible open source license.
*/
package org.opensearch.jobscheduler.rest;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.opensearch.client.node.NodeClient;
import org.opensearch.common.xcontent.ToXContent;
import org.opensearch.common.xcontent.XContentParser;
import org.opensearch.jobscheduler.JobSchedulerPlugin;
import org.opensearch.jobscheduler.model.JobDetails;
import org.opensearch.jobscheduler.transport.GetJobDetailsResponse;
import org.opensearch.jobscheduler.transport.GetJobIndexAction;
import org.opensearch.jobscheduler.transport.GetJobIndexRequest;

import org.opensearch.rest.BaseRestHandler;
import org.opensearch.rest.RestChannel;
import org.opensearch.rest.RestRequest;
import org.opensearch.rest.RestStatus;
import org.opensearch.rest.RestResponse;
import org.opensearch.rest.BytesRestResponse;
import org.opensearch.rest.action.RestResponseListener;

import java.io.IOException;
import java.util.List;
import java.util.Locale;
import java.util.Map;

import static java.util.Arrays.asList;
import static java.util.Collections.unmodifiableList;
import static org.opensearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
import static org.opensearch.rest.RestRequest.Method.PUT;

/**
* This class consists of the REST handler to GET job index from extensions.
*/
public class RestGetJobIndexAction extends BaseRestHandler {
joshpalis marked this conversation as resolved.
Show resolved Hide resolved

public static final String GET_JOB_INDEX_ACTION = "get_job_index_action";

private final Logger logger = LogManager.getLogger(RestGetJobIndexAction.class);

private Map<String, JobDetails> jobDetailsHashMap;

public RestGetJobIndexAction(Map<String, JobDetails> jobDetailsHashMap) {
this.jobDetailsHashMap = jobDetailsHashMap;
}

@Override
public String getName() {
return GET_JOB_INDEX_ACTION;
}

@Override
public List<Route> routes() {
return unmodifiableList(
asList(new Route(PUT, String.format(Locale.ROOT, "%s/%s", JobSchedulerPlugin.JS_BASE_URI, "_get/_job_index")))
);
}

@Override
protected RestChannelConsumer prepareRequest(RestRequest restRequest, NodeClient client) throws IOException {
XContentParser parser = restRequest.contentParser();
ensureExpectedToken(XContentParser.Token.START_OBJECT, parser.nextToken(), parser);

GetJobIndexRequest getJobIndexRequest = GetJobIndexRequest.parse(parser);

JobDetails jobDetails = jobDetailsHashMap.getOrDefault(getJobIndexRequest.getExtensionId(), new JobDetails());
jobDetails.setJobIndex(getJobIndexRequest.getJobIndex());
jobDetails.setJobParserAction(getJobIndexRequest.getJobParserAction());
jobDetails.setJobRunnerAction(getJobIndexRequest.getJobRunnerAction());

jobDetailsHashMap.put(getJobIndexRequest.getExtensionId(), jobDetails);

return channel -> client.execute(GetJobIndexAction.INSTANCE, getJobIndexRequest, getJobIndexResponse(channel, RestStatus.OK));

}

private RestResponseListener<GetJobDetailsResponse> getJobIndexResponse(RestChannel channel, RestStatus status) {
return new RestResponseListener<>(channel) {
@Override
public RestResponse buildResponse(GetJobDetailsResponse getJobDetailsResponse) throws Exception {
return new BytesRestResponse(status, getJobDetailsResponse.toXContent(channel.newBuilder(), ToXContent.EMPTY_PARAMS));
}
};
}

}
Loading