[ML] Change Datafeed actions to read config from the config index #33273

davidkyle · 2018-08-30T15:06:15Z

Changes the datafeed get, put, update and delete actions to use datafeed configs stored in the index

elasticmachine · 2018-08-30T15:06:16Z

Pinging @elastic/ml-core

davidkyle · 2018-08-30T15:10:15Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutDatafeedAction.java

-                new AckedClusterStateUpdateTask<PutDatafeedAction.Response>(request, listener) {
+        String datafeedId = request.getDatafeed().getId();
+        String jobId = request.getDatafeed().getJobId();
+        ElasticsearchException validationError = checkConfigsAreNotDefinedInClusterState(datafeedId, jobId);


Protection against the datefeed or job being defined in the clusterstate. We may not need this in the long run but it's prudent to have now for detecting bugs.

davidkyle · 2018-08-30T15:14:33Z

...ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java

-                    updatedConfigListener.onFailure(
-                            new ElasticsearchParseException("Failed to serialise datafeed config with id [" + datafeedId + "]", e));
-                }
+                validator.accept(updatedConfig, validatedListener);


When the datafeed is updated it must be validated against the job. We don't have the job here so the idea behind this call is go and validate against the job. See TransportUpdateDatafeedAction.validateDatafeedJob

benwtrent · 2018-09-04T13:34:29Z

...k/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsAction.java

+                    }
+
+                    // Merge cluster state and index configs
+                    List<DatafeedConfig> datafeeds = new ArrayList<>();


#preOptimization, but you should probably initialize the array size to be the size of datafeedBuilders + clusterStateConfigs.values()

benwtrent · 2018-09-04T13:47:29Z

...k/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDatafeedsAction.java

+        ));
+    }
+
+    Map<String, DatafeedConfig> expandClusterStateDatafeeds(String datafeedExpression, boolean allowNoDatafeeds,


There is no additional value for it to be a Map verses just a Set, overlap/contains check would still be in O(N) time.

I want to check whether there are 2 datafeeds with the same ID I can't rely on object equality in that case as the datafeeds may be different but use the same ID.

benwtrent · 2018-09-04T13:49:55Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutDatafeedAction.java

-                        return new PutDatafeedAction.Response(request.getDatafeed());
-                    }
+        CheckedConsumer<Boolean, Exception> jobOk = ok ->
+            validateDatafeedAgainstJob(request.getDatafeed(), ActionListener.wrap(validationOk, listener::onFailure));;


;; at end of line

dimitris-athanasiou

A couple of concerns we need to think about. We could always accept these for now but make sure we discuss how we deal with them as we move forwards.

dimitris-athanasiou · 2018-09-17T12:15:04Z

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/job/messages/Messages.java

@@ -41,6 +41,7 @@
    public static final String DATAFEED_MISSING_MAX_AGGREGATION_FOR_TIME_FIELD = "Missing max aggregation for time_field [{0}]";
    public static final String DATAFEED_FREQUENCY_MUST_BE_MULTIPLE_OF_AGGREGATIONS_INTERVAL =
            "Datafeed frequency [{0}] must be a multiple of the aggregation interval [{1}]";
+    public static final String DATAFEED_ID_ALREADY_TAKEN = "A datafeed with Id [{0}] already exists";


We mostly use id (all lower case). There's a few Ids around, but we should probably favour id.

dimitris-athanasiou · 2018-09-17T12:17:05Z

...plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java

+        PersistentTasksCustomMetaData tasks = clusterService.state().getMetaData().custom(PersistentTasksCustomMetaData.TYPE);
+        if (MlTasks.getDatafeedTask(request.getDatafeedId(), tasks) != null) {
+            listener.onFailure(ExceptionsHelper.conflictStatusException(
+                    Messages.getMessage(Messages.DATAFEED_CANNOT_DELETE_IN_CURRENT_STATE, request.getDatafeedId(), DatafeedState.STARTED)));


Missing return statement.

dimitris-athanasiou · 2018-09-17T12:20:07Z

...plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java

@@ -111,28 +117,18 @@ public void onFailure(Exception e) {
        }
    }

-    private void deleteDatafeedFromMetadata(DeleteDatafeedAction.Request request, ActionListener<AcknowledgedResponse> listener) {


We'll need to bring this back later for 6.x, right?

Yes. The equivalent method is missing for Jobs also I thought I would build this on the migrate code

dimitris-athanasiou · 2018-09-17T12:22:43Z

...plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteDatafeedAction.java

+                    Messages.getMessage(Messages.DATAFEED_CANNOT_DELETE_IN_CURRENT_STATE, request.getDatafeedId(), DatafeedState.STARTED)));
+        }
+
+        datafeedConfigProvider.deleteDatafeedConfig(request.getDatafeedId(), ActionListener.wrap(


This is where it gets a bit tricky. We've checked the datafeed is stopped. However, we could receive a call to start the datafeed before the deletion is complete. Then, the check we've done here for deleting will no longer be valid. We need to think how to prevent this. Perhaps, we need to keep a map with deleting flags in MlMetadata? Other ideas?

We discussed this offline and there is a general case for consistent checks for all updates including jobs. That is beyond the scope of this PR though

dimitris-athanasiou · 2018-09-17T13:38:29Z

...ck/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportPutDatafeedAction.java

-                new AckedClusterStateUpdateTask<PutDatafeedAction.Response>(request, listener) {
+        String datafeedId = request.getDatafeed().getId();
+        String jobId = request.getDatafeed().getJobId();
+        ElasticsearchException validationError = checkConfigsAreNotDefinedInClusterState(datafeedId, jobId);


Just an idea that I think makes this more readable, but it's only my opinion. I would refactor the method to return a boolean areDefinedInClusterState, then call if areDefinedInClusterState(...) { listener.onFailure(...); return }. This way we don't have to store the error in a local variable, etc.

checkConfigsAreNotDefinedInClusterState can return different exceptions depending on the error case so the refactor isn't simple

dimitris-athanasiou · 2018-09-17T13:42:31Z

...plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportUpdateDatafeedAction.java

+        }
+    }
+
+    private void validateDatafeedJob(DatafeedConfig updatedConfig, ActionListener<Boolean> listener) {


This method seems like it could be in JobConfigProvider? Then we don't have to duplicate it between this action and the put-datafeed action.

dimitris-athanasiou · 2018-09-17T13:44:59Z

...ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java

+     */
+    public void findDatafeedForJobId(String jobId, ActionListener<Set<String>> listener) {
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder().query(buildDatafeedJobIdQuery(jobId));
+        sourceBuilder.sort(DatafeedConfig.ID.getPreferredName());


Do we need to sort on the datafeed id here?

dimitris-athanasiou · 2018-09-17T13:45:41Z

...ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java

+                .setSource(sourceBuilder).request();
+
+        executeAsyncWithOrigin(client.threadPool().getThreadContext(), ML_ORIGIN, searchRequest,
+                ActionListener.<SearchResponse>wrap(


Is the type qualification necessary? Could we just do ActionListener.wrap?

Yes because client::search is overloaded

dimitris-athanasiou · 2018-09-17T13:48:14Z

...ml/src/main/java/org/elasticsearch/xpack/ml/datafeed/persistence/DatafeedConfigProvider.java

+                            Set<String> datafeedIds = new HashSet<>();
+                            SearchHit[] hits = response.getHits().getHits();
+                            // There should be 0 or 1 datafeeds referencing the same job
+                            assert hits.length <= 1;


This is again one of those tricky points. I think it might now be possible to get 2 datafeeds referencing the same job as it's possible 2 concurrent PUTs end up passing the validation. We need to think this through.

Yes and the purpose of the assertion is to find those errors during developement

dimitris-athanasiou

LGTM

…3273)

…astic#33273)

* [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 2 commits August 30, 2018 11:08

Change datafeed endpoints to use the index

9c719cd

Fix mocking to test where SearchHit.field is used

130d350

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

davidkyle commented Aug 30, 2018

View reviewed changes

benwtrent reviewed Sep 4, 2018

View reviewed changes

Address feedback

9f64779

davidkyle force-pushed the datafeed-crud branch from 5626074 to 9f64779 Compare September 12, 2018 14:36

davidkyle mentioned this pull request Sep 12, 2018

[ML] Metadata Migration Meta issue #32905

Closed

43 tasks

dimitris-athanasiou reviewed Sep 17, 2018

View reviewed changes

Address review feedback

242c165

dimitris-athanasiou approved these changes Sep 18, 2018

View reviewed changes

davidkyle merged this pull request into elastic:feature/jindex-6.x Sep 18, 2018

davidkyle deleted the datafeed-crud branch September 18, 2018 11:48

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

[ML] Change Datafeed actions to read config from the config index (#3…

cfafe3c

…3273)

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

[ML] Change Datafeed actions to read config from the config index (#3…

18396db

…3273)

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

[ML] Change Datafeed actions to read config from the config index (#3…

eb38126

…3273)

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

[ML] Change Datafeed actions to read config from the config index (#3…

07cceaf

…3273)

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

[ML] Change Datafeed actions to read config from the config index (el…

92979f4

…astic#33273)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ML] Change Datafeed actions to read config from the config index #33273

[ML] Change Datafeed actions to read config from the config index #33273

davidkyle commented Aug 30, 2018

elasticmachine commented Aug 30, 2018

davidkyle Aug 30, 2018

davidkyle Aug 30, 2018

benwtrent Sep 4, 2018

benwtrent Sep 4, 2018

davidkyle Sep 12, 2018

benwtrent Sep 4, 2018

dimitris-athanasiou left a comment

dimitris-athanasiou Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

davidkyle Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

davidkyle Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

davidkyle Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

davidkyle Sep 17, 2018

dimitris-athanasiou Sep 17, 2018

davidkyle Sep 17, 2018

dimitris-athanasiou left a comment

[ML] Change Datafeed actions to read config from the config index #33273

[ML] Change Datafeed actions to read config from the config index #33273

Conversation

davidkyle commented Aug 30, 2018

elasticmachine commented Aug 30, 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

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

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