[ML] Job config document CRUD operations #32738

davidkyle · 2018-08-09T09:18:36Z

CRUD functions for the job configuration document. This also handles the expansion of job groups and wildcarded job IDs similar to the current functionality in MlMetadata.expandJobIds().

The new class JobConfigProvider should not do any job validation it is simply there to index and retrieve docs, hence put takes a built and validated job and get returns an unvalidated Job.Builder. This falls apart when it comes to update as the update function must perform some validation.

If there are 10,000 jobs how will this be handled? Will the results be paged, will we scroll search be used or can all jobs be returned? Should be consider a limit on the max number of jobs?

elasticmachine · 2018-08-09T09:18:37Z

Pinging @elastic/ml-core

davidkyle · 2018-08-09T09:28:40Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

+     * @param listener The expanded job IDs listener
+     * @return the set of matching names
+     */
+    public void expandJobsIds(String expression, boolean allowNoJobs, ActionListener<Set<String>> listener) {


The behaviour of allowNoJobs has changed slightly as it only applies if expression is '*' or '_all' whereas before it applied to each token in a comma delineated list foo-*,bar.

Given that the option isn't documented and the new behaviour matches the description in the API spec I can live with the subtle change

The intention was that allow_no_jobs would work exactly how allow_no_indices works for index wildcards - see https://www.elastic.co/guide/en/elasticsearch/reference/current/multi-index.html

In the case of foo-*,bar, an exception should always be thrown if bar doesn't exist, and should be thrown if foo-* doesn't exist if and only if allow_no_jobs is false.

The intention was that job wildcard expansion would work like index wildcard expansion, and job groups would work like aliases, so that if anybody asked how they work we'd be able to give a simple answer and people who just assumed there would be consistency between different endpoints would be correct.

The original behaviour could be replicated, one option is to make a query for each token in expression and check the results.

However, maybe this can still be done with a single query. Check the results and throw if a token is not a wildcard and no job with that Id was returned or if the token is a wildcard check for matching job IDs and throw depending on the value of allow_no_jobs. How this could work with paging or a scroll search I do not know.

How this could work with paging or a scroll search I do not know

I think we'd have to set up a map of token to boolean before starting, record what we saw during the paging or scroll, then throw errors at the very end.

I pushed a change to replicate the old allow_no_jobs functionality, it's a little complicated but hopefully the code is self-explanatory (if not it needs a rewrite). This should work with any future scroll search/paging change

dimitris-athanasiou

Looks good. Left some comments.

dimitris-athanasiou · 2018-08-09T10:15:39Z

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/config/Job.java

+     * @return The id of document the job is persisted in
+     */
+    public static String documentId(String jobId) {
+        return "job-" + jobId;


since we're back at having the jobs indexed, we should double check the length limit on the ID is correct

dimitris-athanasiou · 2018-08-09T10:18:36Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

+     * @param jobId The job ID
+     * @param jobListener Job listener
+     */
+    public void getJob(String jobId, ActionListener<Job.Builder> jobListener) {


I think this should be returning the built job.

I wanted to avoid the current situation we have where we cannot change the validation as building the job will throw. Getting an old job on an upgraded node where the validation has changed (due to some bug say) would be impossible if we validate here so you couldn't even view the job. This class is just for config index operations the validation can be done elsewhere at the appropriate place.

dimitris-athanasiou · 2018-08-09T10:26:09Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

+     * @param updatedJobListener Updated job listener
+     */
+    public void updateJob(String jobId, JobUpdate update, ByteSizeValue maxModelMemoryLimit, ActionListener<Job> updatedJobListener) {
+        GetRequest getRequest = new GetRequest(AnomalyDetectorsIndex.configIndexName(),


Could we reuse the getJob method here?

No because the version is required to ensure consistency when the updated job is indexed.

dimitris-athanasiou · 2018-08-09T10:27:40Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

+                    return;
+                }
+
+                try (XContentBuilder builder = XContentFactory.jsonBuilder()) {


and reuse putJob here? We'd have to factor out the index request in a private method that takes the OpType as a parameter but it would save us some code.

dimitris-athanasiou · 2018-08-09T10:36:04Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

+        return boolQueryBuilder;
+    }
+
+    private void parseJobLenientlyFromSource(BytesReference source, ActionListener<Job.Builder> jobListener)  {


These 2 parsing methods should return built jobs.

dimitris-athanasiou · 2018-08-09T10:41:06Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

+                .setIndicesOptions(IndicesOptions.lenientExpandOpen())
+                .setSource(sourceBuilder).request();
+
+        final boolean isWildCardExpression = isWildCard(expression);


I think we can replace this by simply looking whether there is a * in the expression and then the behaviour will remain the same. We could even reuse Regex.isSimpleMatchPattern to the whole expression untokenized.

Actually that's not correct. We need to check for each token in the expression so scrap that.

dimitris-athanasiou · 2018-08-09T10:42:58Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

+        final boolean isWildCardExpression = isWildCard(expression);
+
+        executeAsyncWithOrigin(client.threadPool().getThreadContext(), ML_ORIGIN, searchRequest,
+                ActionListener.<SearchResponse>wrap(


nit: is the qualification of <SearchResponse> needed here?

droberts195

LGTM, although I left a suggestion for changing the comment of a method that I initially assumed did something different to what it does.

droberts195 · 2018-08-13T12:22:15Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

-            jobListener.onFailure(e);
+    /**
+     * Does the {@code tokens} array resolves to a wildcard all expression.
+     * True if {@code tokens} is empty or if it contains a single element


If the tokens contain a full wildcard and something else then that's still a full wildcard overall. E.g. foo,* still means get everything, but with the way this method is used it makes sense not to report it. I think the comment should be changed to make clear that this function doesn't cover this case.

* [ML] Job and datafeed mappings with index template (#32719) Index mappings for the configuration documents * [ML] Job config document CRUD operations (#32738) * [ML] Datafeed config CRUD operations (#32854) * [ML] Change JobManager to work with Job config in index (#33064) * [ML] Change Datafeed actions to read config from the config index (#33273) * [ML] Allocate jobs based on JobParams rather than cluster state config (#33994) * [ML] Return missing job error when .ml-config is does not exist (#34177) * [ML] Close job in index (#34217) * [ML] Adjust finalize job action to work with documents (#34226) * [ML] Job in index: Datafeed node selector (#34218) * [ML] Job in Index: Stop and preview datafeed (#34605) * [ML] Delete job document (#34595) * [ML] Convert job data remover to work with index configs (#34532) * [ML] Job in index: Get datafeed and job stats from index (#34645) * [ML] Job in Index: Convert get calendar events to index docs (#34710) * [ML] Job in index: delete filter action (#34642) This changes the delete filter action to search for jobs using the filter to be deleted in the index rather than the cluster state. * [ML] Job in Index: Enable integ tests (#34851) Enables the ml integration tests excluding the rolling upgrade tests and a lot of fixes to make the tests pass again. * [ML] Reimplement established model memory (#35500) This is the 7.0 implementation of a master node service to keep track of the native process memory requirement of each ML job with an associated native process. The new ML memory tracker service works when the whole cluster is upgraded to at least version 6.6. For mixed version clusters the old mechanism of established model memory stored on the job in cluster state was used. This means that the old (and complex) code to keep established model memory up to date on the job object has been removed in 7.0. Forward port of #35263 * [ML] Need to wait for shards to replicate in distributed test (#35541) Because the cluster was expanded from 1 node to 3 indices would initially start off with 0 replicas. If the original node was killed before auto-expansion to 1 replica was complete then the test would fail because the indices would be unavailable. * [ML] DelayedDataCheckConfig index mappings (#35646) * [ML] JIndex: Restore finalize job action (#35939) * [ML] Replace Version.CURRENT in streaming functions (#36118) * [ML] Use 'anomaly-detector' in job config doc name (#36254) * [ML] Job In Index: Migrate config from the clusterstate (#35834) Migrate ML configuration from clusterstate to index for closed jobs only once all nodes are v6.6.0 or higher * [ML] Check groups against job Ids on update (#36317) * [ML] Adapt to periodic persistent task refresh (#36633) * [ML] Adapt to periodic persistent task refresh If https://github.com/elastic/elasticsearch/pull/36069/files is merged then the approach for reallocating ML persistent tasks after refreshing job memory requirements can be simplified. This change begins the simplification process. * Remove AwaitsFix and implement TODO * [ML] Default search size for configs * Fix TooManyJobsIT.testMultipleNodes Two problems: 1. Stack overflow during async iteration when lots of jobs on same machine 2. Not effectively setting search size in all cases * Use execute() instead of submit() in MlMemoryTracker We don't need a Future to wait for completion * [ML][TEST] Fix NPE in JobManagerTests * [ML] JIindex: Limit the size of bulk migrations (#36481) * [ML] Prevent updates and upgrade tests (#36649) * [FEATURE][ML] Add cluster setting that enables/disables config migration (#36700) This commit adds a cluster settings called `xpack.ml.enable_config_migration`. The setting is `true` by default. When set to `false`, no config migration will be attempted and non-migrated resources (e.g. jobs, datafeeds) will be able to be updated normally. Relates #32905 * [ML] Snapshot ml configs before migrating (#36645) * [FEATURE][ML] Split in batches and migrate all jobs and datafeeds (#36716) Relates #32905 * SQL: Fix translation of LIKE/RLIKE keywords (#36672) * SQL: Fix translation of LIKE/RLIKE keywords Refactor Like/RLike functions to simplify internals and improve query translation when chained or within a script context. Fix #36039 Fix #36584 * Fixing line length for EnvironmentTests and RecoveryTests (#36657) Relates #34884 * Add back one line removed by mistake regarding java version check and COMPAT jvm parameter existence * Do not resolve addresses in remote connection info (#36671) The remote connection info API leads to resolving addresses of seed nodes when invoked. This is problematic because if a hostname fails to resolve, we would not display any remote connection info. Yet, a hostname not resolving can happen across remote clusters, especially in the modern world of cloud services with dynamically chaning IPs. Instead, the remote connection info API should be providing the configured seed nodes. This commit changes the remote connection info to display the configured seed nodes, avoiding a hostname resolution. Note that care was taken to preserve backwards compatibility with previous versions that expect the remote connection info to serialize a transport address instead of a string representing the hostname. * [Painless] Add boxed type to boxed type casts for method/return (#36571) This adds implicit boxed type to boxed types casts for non-def types to create asymmetric casting relative to the def type when calling methods or returning values. This means that a user calling a method taking an Integer can call it with a Byte, Short, etc. legally which matches the way def works. This creates consistency in the casting model that did not previously exist. * SNAPSHOTS: Adjust BwC Versions in Restore Logic (#36718) * Re-enables bwc tests with adjusted version conditions now that #36397 enables concurrent snapshots in 6.6+ * ingest: fix on_failure with Drop processor (#36686) This commit allows a document to be dropped when a Drop processor is used in the on_failure fork of the processor chain. Fixes #36151 * Initialize startup `CcrRepositories` (#36730) Currently, the CcrRepositoryManger only listens for settings updates and installs new repositories. It does not install the repositories that are in the initial settings. This commit, modifies the manager to install the initial repositories. Additionally, it modifies the ccr integration test to configure the remote leader node at startup, instead of using a settings update. * [TEST] fix float comparison in RandomObjects#getExpectedParsedValue This commit fixes a test bug introduced with #36597. This caused some test failure as stored field values comparisons would not work when CBOR xcontent type was used. Closes #29080 * [Geo] Integrate Lucene's LatLonShape (BKD Backed GeoShapes) as default `geo_shape` indexing approach (#35320) This commit exposes lucene's LatLonShape field as the default type in GeoShapeFieldMapper. To use the new indexing approach, simply set "type" : "geo_shape" in the mappings without setting any of the strategy, precision, tree_levels, or distance_error_pct parameters. Note the following when using the new indexing approach: * geo_shape query does not support querying by MULTIPOINT. * LINESTRING and MULTILINESTRING queries do not yet support WITHIN relation. * CONTAINS relation is not yet supported. The tree, precision, tree_levels, distance_error_pct, and points_only parameters are deprecated. * TESTS:Debug Log. IndexStatsIT#testFilterCacheStats * ingest: support default pipelines + bulk upserts (#36618) This commit adds support to enable bulk upserts to use an index's default pipeline. Bulk upsert, doc_as_upsert, and script_as_upsert are all supported. However, bulk script_as_upsert has slightly surprising behavior since the pipeline is executed _before_ the script is evaluated. This means that the pipeline only has access the data found in the upsert field of the script_as_upsert. The non-bulk script_as_upsert (existing behavior) runs the pipeline _after_ the script is executed. This commit does _not_ attempt to consolidate the bulk and non-bulk behavior for script_as_upsert. This commit also adds additional testing for the non-bulk behavior, which remains unchanged with this commit. fixes #36219 * Fix duplicate phrase in shrink/split error message (#36734) This commit removes a duplicate "must be a" from the shrink/split error messages. * Deprecate types in get_source and exist_source (#36426) This change adds a new untyped endpoint `{index}/_source/{id}` for both the GET and the HEAD methods to get the source of a document or check for its existance. It also adds deprecation warnings to RestGetSourceAction that emit a warning when the old deprecated "type" parameter is still used. Also updating documentation and tests where appropriate. Relates to #35190 * Revert "[Geo] Integrate Lucene's LatLonShape (BKD Backed GeoShapes) as default `geo_shape` indexing approach (#35320)" This reverts commit 5bc7822. * Enhance Invalidate Token API (#35388) This change: - Adds functionality to invalidate all (refresh+access) tokens for all users of a realm - Adds functionality to invalidate all (refresh+access)tokens for a user in all realms - Adds functionality to invalidate all (refresh+access) tokens for a user in a specific realm - Changes the response format for the invalidate token API to contain information about the number of the invalidated tokens and possible errors that were encountered. - Updates the API Documentation After back-porting to 6.x, the `created` field will be removed from master as a field in the response Resolves: #35115 Relates: #34556 * Add raw sort values to SearchSortValues transport serialization (#36617) In order for CCS alternate execution mode (see #32125) to be able to do the final reduction step on the CCS coordinating node, we need to serialize additional info in the transport layer as part of each `SearchHit`. Sort values are already present but they are formatted according to the provided `DocValueFormat` provided. The CCS node needs to be able to reconstruct the lucene `FieldDoc` to include in the `TopFieldDocs` and `CollapseTopFieldDocs` which will feed the `mergeTopDocs` method used to reduce multiple search responses (one per cluster) into one. This commit adds such information to the `SearchSortValues` and exposes it through a new getter method added to `SearchHit` for retrieval. This info is only serialized at transport and never printed out at REST. * Watcher: Ensure all internal search requests count hits (#36697) In previous commits only the stored toXContent version of a search request was using the old format. However an executed search request was already disabling hit counts. In 7.0 hit counts will stay enabled by default to allow for proper migration. Closes #36177 * [TEST] Ensure shard follow tasks have really stopped. Relates to #36696 * Ensure MapperService#getAllMetaFields elements order is deterministic (#36739) MapperService#getAllMetaFields returns an array, which is created out of an `ObjectHashSet`. Such set does not guarantee deterministic hash ordering. The array returned by its toArray may be sorted differently at each run. This caused some repeatability issues in our tests (see #29080) as we pick random fields from the array of possible metadata fields, but that won't be repeatable if the input array is sorted differently at every run. Once setting the tests seed, hppc picks that up and the sorting is deterministic, but failures don't repeat with the seed that gets printed out originally (as a seed was not originally set). See also https://issues.carrot2.org/projects/HPPC/issues/HPPC-173. With this commit, we simply create a static sorted array that is used for `getAllMetaFields`. The change is in production code but really affects only testing as the only production usage of this method was to iterate through all values when parsing fields in the high-level REST client code. Anyways, this seems like a good change as returning an array would imply that it's deterministically sorted. * Expose Sequence Number based Optimistic Concurrency Control in the rest layer (#36721) Relates #36148 Relates #10708 * [ML] Mute MlDistributedFailureIT

davidkyle added 5 commits August 9, 2018 09:53

Crud ops

49539f1

Rename class

3d3bb5b

Tests for creating duplicate jobs

a414466

Handle validation errors on update

89bee8e

Correct precommit checks

f6c8f33

davidkyle added >feature review :ml Machine learning labels Aug 9, 2018

davidkyle commented Aug 9, 2018

View reviewed changes

dimitris-athanasiou reviewed Aug 9, 2018

View reviewed changes

davidkyle added 2 commits August 10, 2018 11:38

Allow no jobs applies to each token in the expression

887fa02

Another bloody checkstyle failure

8f0427b

droberts195 approved these changes Aug 13, 2018

View reviewed changes

davidkyle merged commit 6fd6e30 into elastic:feature/jindex-6.x Aug 13, 2018

davidkyle deleted the job-config-crud branch August 13, 2018 13:48

davidkyle mentioned this pull request Aug 14, 2018

[ML] Datafeed config CRUD operations #32854

Merged

davidkyle added a commit that referenced this pull request Aug 15, 2018

[ML] Job config document CRUD operations (#32738)

9766da8

davidkyle mentioned this pull request Aug 16, 2018

[ML] Metadata Migration Meta issue #32905

Closed

43 tasks

davidkyle added a commit that referenced this pull request Aug 29, 2018

[ML] Job config document CRUD operations (#32738)

054ae64

davidkyle added a commit that referenced this pull request Sep 18, 2018

[ML] Job config document CRUD operations (#32738)

5db5004

davidkyle added a commit that referenced this pull request Sep 28, 2018

[ML] Job config document CRUD operations (#32738)

d1c3401

davidkyle added a commit that referenced this pull request Oct 2, 2018

[ML] Job config document CRUD operations (#32738)

af6c1b9

davidkyle added a commit that referenced this pull request Oct 18, 2018

[ML] Job config document CRUD operations (#32738)

44322b1

davidkyle added a commit to davidkyle/elasticsearch that referenced this pull request Oct 29, 2018

[ML] Job config document CRUD operations (elastic#32738)

27a81f7

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ML] Job config document CRUD operations #32738

[ML] Job config document CRUD operations #32738

davidkyle commented Aug 9, 2018 •

edited

Loading

elasticmachine commented Aug 9, 2018

davidkyle Aug 9, 2018

droberts195 Aug 9, 2018

davidkyle Aug 9, 2018

droberts195 Aug 9, 2018

davidkyle Aug 10, 2018

dimitris-athanasiou left a comment

dimitris-athanasiou Aug 9, 2018

dimitris-athanasiou Aug 9, 2018

davidkyle Aug 9, 2018

dimitris-athanasiou Aug 9, 2018

davidkyle Aug 9, 2018

dimitris-athanasiou Aug 9, 2018

dimitris-athanasiou Aug 9, 2018

dimitris-athanasiou Aug 9, 2018

dimitris-athanasiou Aug 9, 2018

dimitris-athanasiou Aug 9, 2018

droberts195 left a comment

droberts195 Aug 13, 2018

[ML] Job config document CRUD operations #32738

[ML] Job config document CRUD operations #32738

Conversation

davidkyle commented Aug 9, 2018 • edited Loading

elasticmachine commented Aug 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dimitris-athanasiou left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

droberts195 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

davidkyle commented Aug 9, 2018 •

edited

Loading