[ML] Change JobManager to work with Job config in index #33064

davidkyle · 2018-08-22T15:28:28Z

Changes the JobManager CRUD operations to use the job configurations stored as index documents.

This change breaks the build - only the unit and integration tests pass, the QA, yml rest tests and BWC tests all fail. Rather than disabling individual tests (and because this will be merged to a feature branch) the tests will be fixed in later PRs. This is an consequence of making the PRs small enough to be reviewable rather than putting all the work in one enormous change.

JobManager.getJobOrThrowIfUnknown has been renamed to getJob and a listener parameter added. This affects a lot of code but in most cases it is simply a matter of wrapping the code that followed a call to getJobOrThrowIfUnknown inside an ActionListener.

getJobs looks in both the index and the cluster state for the config, delete update and create only work with the index documents. Should we retains the ability to delete jobs from the cluster state?

One unexpected problem i hit was with notifying jobs using a certain filter that the filter has changed. It would be nice to query for jobs using the filter but this is not easy the way the document is constructed. A rule with a filter looks like this:

           "custom_rules" : [
             {
               "actions" : [
                 "skip_result"
               ],
               "scope" : {
                 "FIELD_NAME" : {
                   "filter_id" : "filter-1",
                   "filter_type" : "exclude"
                 }
               }
             }

Where FIELD_NAME is the by/partition/over field which will change for each job meaning the full path to filter_id is different for different jobs. For the mapping one solution is use a dynamic mapping:

      "dynamic_templates": [
        {
          "filter_id_as_keyword": {
            "path_match":   "*.filter_id",
            "mapping": {
              "type":       "keyword"
            }
          }
        }
      ]

But this causes a mapping explosion as each FIELD_NAME creates a new mapping. e.g. If I create 2 jobs using filters on the fields host and client I end up with a mapping for ...scope.host.filter_id and ...scope.client.filter_id.

                      "scope" : {
                        "properties" : {
                          "client" : {
                            "properties" : {
                              "filter_id" : {
                                "type" : "keyword"
                              }
                            }
                          },
                          "host" : {
                            "properties" : {
                              "filter_id" : {
                                "type" : "keyword"
                              }
                            }
                          }

Secondly I have not found a query that works.

Parking this problem for now the implemented work-around is to not audit the filter change for jobs that are closed (for open jobs I build the list of jobs that are open from the active persistent tasks then query for those via the Ids then check if any use the filter)

elasticmachine · 2018-08-22T15:28:30Z

Pinging @elastic/ml-core

davidkyle · 2018-08-22T15:32:52Z

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportJobTaskAction.java

@@ -54,8 +52,6 @@ protected void doExecute(Task task, Request request, ActionListener<Response> li
        String jobId = request.getJobId();
        // We need to check whether there is at least an assigned task here, otherwise we cannot redirect to the
        // node running the job task.
-        ClusterState state = clusterService.state();
-        JobManager.getJobOrThrowIfUnknown(jobId, state);


There is no way to check for the existence of the job config here. If an async call is made the function will exit and continue it's work and a blocking call should not be made here.

The change will mean that all actions that inherit TransportJobTaskAction will return an error along the lines of the persistent task does not exist for job [unknown-job] rather than the usual unknown job message.

dimitris-athanasiou · 2018-08-23T13:29:59Z

Should we retains the ability to delete jobs from the cluster state?

If we don't, then if for any reason jobs remain unconverted for a while and a user tries to delete such a job, it won't be deleted.

dimitris-athanasiou · 2018-08-24T11:35:12Z

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java

@@ -466,26 +478,40 @@ private static void appendCommaSeparatedSet(Set<String> items, StringBuilder sb)
        sb.append("]");
    }

-    public void updateProcessOnCalendarChanged(List<String> calendarJobIds) {
+    public void updateProcessOnCalendarChanged(List<String> calendarJobIds, ActionListener<Boolean> updateListener) {


I think this was already expected to work in an async fashion. It was just queueing the update but the callers are not really expecting the update to complete before they respond. Unless I'm missing something, we probably can remove the listener here and simple have an internal one for doing the callback after we expand the job ids.

dimitris-athanasiou

Some more comments as I'm going through

dimitris-athanasiou · 2018-08-24T13:52:13Z

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

+                    ForecastParams params = paramsBuilder.build();
+                    processManager.forecastJob(task, params, e -> {
+                        if (e == null) {
+                            Consumer<ForecastRequestStats> forecastRequestStatsHandler = forecastRequestStats -> {


One way to avoid excessive indentation and also improve the readability here, would be to extract functionality into private methods.

dimitris-athanasiou · 2018-08-24T13:59:51Z

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java

@@ -117,55 +120,89 @@ private void setMaxModelMemoryLimit(ByteSizeValue maxModelMemoryLimit) {
        this.maxModelMemoryLimit = maxModelMemoryLimit;
    }

+    public void jobExist(String jobId, ActionListener<Boolean> listener) {


rename to jobExists?

dimitris-athanasiou · 2018-08-24T14:01:57Z

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java

    }

    /**
-     * Gets the job that matches the given {@code jobId}.
-     *
+     * Even this this uses a listener the job is returned on the same thread


double this

dimitris-athanasiou · 2018-08-24T14:04:47Z

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java

+                        jobs.add(jb.build());
+                    }
+
+                    jobs.addAll(clusterStateJobs.values());


I think this is expected to be a sorted list on the job_id.

dimitris-athanasiou · 2018-08-24T14:06:33Z

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java

+                            actionListener.onResponse(new PutJobAction.Response(job));
+                        },
+                        e -> {
+                            if (e instanceof VersionConflictEngineException) {


This seems like it should be handled in the JobConfigProvider so that any callers don't have to deal with the same error handling.

dimitris-athanasiou · 2018-08-24T15:09:35Z

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

+                            Set<String> jobIds = new HashSet<>();
+                            SearchHit[] hits = response.getHits().getHits();
+                            for (SearchHit hit : hits) {
+                                jobIds.add((String)hit.getSourceAsMap().get(Job.ID.getPreferredName()));


Could you use hit.field(Job.ID.getPreferredName())?

dimitris-athanasiou · 2018-08-24T15:10:57Z

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java

+                expandedIds -> {
+                    threadPool.executor(MachineLearning.UTILITY_THREAD_POOL_NAME).execute(() -> {
+                        // Merge the expended group members with the request Ids.
+                        // Ids that aren't jobs will be filtered by by isJobOpen()


double by

dimitris-athanasiou · 2018-08-24T16:10:33Z

Also just realised, we need to merge Jason's tests move into this branch, or we'll have serious conflicts later on.

dimitris-athanasiou · 2018-08-24T16:26:07Z

Another problem here, is job searches are missing a size parameter which means we are only returning 10 jobs max.

dimitris-athanasiou · 2018-08-24T16:40:00Z

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

+                AnalysisConfig.DETECTORS.getPreferredName(), Detector.CUSTOM_RULES_FIELD.getPreferredName()), ".");
+        SearchSourceBuilder sourceBuilder = new SearchSourceBuilder()
+                .query(QueryBuilders.nestedQuery(customRulesPath, QueryBuilders.existsQuery(customRulesPath), ScoreMode.None))
+                .size(10000);


This will have to be extracted to a constant and be used by all searches. I think we should also think how to refactor the code that does the job search into something that is reused as a few methods are doing such searches.

Rename jobExist(s) function, reformat code, use doc values in job Id search and sort jobs by Id.

davidkyle

This commit LGTM. I can't approve it though as I created the PR.

There is still a TODO in job manager that is no longer relevant can you remove // TODO JIndex previously the filter change would also be audited for closed jobs please

dimitris-athanasiou

LGTM

* [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

Job manager

6360cab

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

davidkyle commented Aug 22, 2018

View reviewed changes

dimitris-athanasiou reviewed Aug 24, 2018

View reviewed changes

Addresses the filter update issue by finding all jobs with custom rules

fdf1405

dimitris-athanasiou reviewed Aug 24, 2018

View reviewed changes

Address review comments.

291829a

Rename jobExist(s) function, reformat code, use doc values in job Id search and sort jobs by Id.

davidkyle mentioned this pull request Aug 28, 2018

[ML] Metadata Migration Meta issue #32905

Closed

43 tasks

Add integration test for findJobsWithCustomRules()

ebe9a07

davidkyle commented Aug 28, 2018

View reviewed changes

Remove todo and unused import

5d0f0f6

dimitris-athanasiou approved these changes Aug 28, 2018

View reviewed changes

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

davidkyle deleted the job-manager-crud branch August 29, 2018 16:05

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

[ML] Change JobManager to work with Job config in index (#33064)

3907867

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

[ML] Change JobManager to work with Job config in index (#33064)

8273c6a

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

[ML] Change JobManager to work with Job config in index (#33064)

103304c

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

[ML] Change JobManager to work with Job config in index (#33064)

d3917dd

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

[ML] Change JobManager to work with Job config in index (#33064)

e4eb4d7

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

[ML] Change JobManager to work with Job config in index (elastic#33064)

7b56999

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ML] Change JobManager to work with Job config in index #33064

[ML] Change JobManager to work with Job config in index #33064

davidkyle commented Aug 22, 2018

elasticmachine commented Aug 22, 2018

davidkyle Aug 22, 2018

dimitris-athanasiou commented Aug 23, 2018

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou left a comment

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou Aug 24, 2018

dimitris-athanasiou commented Aug 24, 2018

dimitris-athanasiou commented Aug 24, 2018

dimitris-athanasiou Aug 24, 2018

davidkyle left a comment

dimitris-athanasiou left a comment

[ML] Change JobManager to work with Job config in index #33064

[ML] Change JobManager to work with Job config in index #33064

Conversation

davidkyle commented Aug 22, 2018

elasticmachine commented Aug 22, 2018

Choose a reason for hiding this comment

dimitris-athanasiou commented Aug 23, 2018

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

dimitris-athanasiou commented Aug 24, 2018

dimitris-athanasiou commented Aug 24, 2018

Choose a reason for hiding this comment

davidkyle left a comment

Choose a reason for hiding this comment

dimitris-athanasiou left a comment

Choose a reason for hiding this comment