Fix saving index pattern when there is a conflict #21947

jen-huang · 2018-08-13T21:47:21Z

Fixes #21932

Changes in #20384 changed error handling to return kfetch's FetchError object. Saving index pattern is dependent on statusCode, which is not a top level property of FetchError. PR updates to look for res.status instead.

nreese · 2018-08-13T21:52:32Z

src/ui/public/saved_objects/saved_objects_client.js

@@ -232,6 +232,16 @@ export class SavedObjectsClient {
      return Promise.reject(new Error('body not permitted for GET requests'));
    }

-    return kfetch({ method, pathname: path, query, body: JSON.stringify(body) });
+    return kfetch({ method, pathname: path, query, body: JSON.stringify(body) })
+      .catch(resp => {


The problem is that you are not getting the REST resp from kfetch. kfetch is going to reject the promise with a FetchError

FetchError still has res and body properties:
https://github.com/elastic/kibana/blob/master/src/ui/public/kfetch/kfetch.ts#L29

I'll rename these variables so they reflect an instance of FetchError.

nreese · 2018-08-13T22:18:56Z

This is going to break places that have been updated to handle a FetchError. I would recommend just updating the consumers to directly handle FetchError.

https://github.com/elastic/kibana/blob/master/src/ui/public/error_auto_create_index/error_auto_create_index.js#L32

https://github.com/elastic/kibana/blob/master/src/ui/public/courier/saved_object/saved_object.js#L305

jen-huang · 2018-08-13T22:46:01Z

@nreese Thanks for those references! I'm concerned about the places that haven't been updated to know about FetchError and are still attempting to read top level statusCode (the only problematic/missing property). Grepping on statusCode shows many results and it's hard to tell if those references are in saved objects context. I'd like to get your assessment on the likelihood of similar breakage in other areas.

I'll update this PR to modify the index pattern client instead in the meantime.

nreese

lgtm
code review

elasticmachine · 2018-08-14T00:32:46Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

23:57:29    │ proc  [ftr]        └-> "before all" hook
23:57:29    │ proc  [ftr]        └-> applies the correct CSS classes
23:57:29    │ proc  [ftr]          └-> "before each" hook: global before each
23:57:29    │ proc  [ftr]          │ debg  TestSubjects.find(grokDebugger acePatternInput codeEditorContainer)
23:57:29    │ proc  [ftr]          │ debg  findByCssSelector [data-test-subj~="grokDebugger"] [data-test-subj~="acePatternInput"] [data-test-subj~="codeEditorContainer"]
23:57:29    │ proc  [ftr]          │ debg  TestSubjects.find(grokDebugger acePatternInput codeEditorContainer)
23:57:29    │ proc  [ftr]          │ debg  findByCssSelector [data-test-subj~="grokDebugger"] [data-test-subj~="acePatternInput"] [data-test-subj~="codeEditorContainer"]
23:57:30    │ proc  [ftr]          │ info  Taking screenshot "/var/lib/jenkins/workspace/elastic+kibana+pull-request+multijob-x-pack/kibana/x-pack/test/functional/screenshots/failure/logstash grok debugger app syntax highlighting applies the correct CSS classes.png"
23:57:30    │ proc  [ftr]          │ info  Current URL is: http://localhost:5640/app/kibana#/dev_tools/grokdebugger?_g=()
23:57:30    │ proc  [ftr]          │ info  Saving page source to: /var/lib/jenkins/workspace/elastic+kibana+pull-request+multijob-x-pack/kibana/x-pack/test/functional/failure_debug/html/logstash grok debugger app syntax highlighting applies the correct CSS classes.html
23:57:30    │ proc  [ftr]        └- ✖ fail: "logstash grok debugger app syntax highlighting applies the correct CSS classes"
23:57:30    │ proc  [ftr]        │        [GET http://localhost:9515/session/f6ea74747226692705633433d95ce268/element/0.23236615736280375-35/text] stale element reference: element is not attached to the page document

jen-huang · 2018-08-14T15:46:54Z

Retest

elasticmachine · 2018-08-14T17:34:04Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

Same failure as above. Passes locally 😞Merging master to see if that helps.

elasticmachine · 2018-08-14T20:26:09Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

Weird ES-related failures. Aborted.

jen-huang · 2018-08-14T20:44:27Z

Retest

elasticmachine · 2018-08-14T23:26:09Z

💔 Build Failed

continuous-integration/kibana-ci/pull-request

jen-huang · 2018-08-15T02:44:55Z

Retest

elasticmachine · 2018-08-15T04:27:28Z

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

LeeDr · 2018-08-15T17:09:17Z

@jen-huang What will happen now in this same case? What will the user see?

In the issue this PR fixes, it could really be any Kibana user that does something that causes a change to the index pattern while you're trying to format a field or add a scripted field which causes the version conflict.
We don't want this user to clobber the previous version change. I'm thinking it should give an error that lets them know they need to refresh the page and try again?

jen-huang · 2018-08-15T17:20:46Z

@LeeDr, the user will see an error that their version is out of date and they need to refresh. This was implemented in #18937, but broke due to some error formatting changes. This PR just adjusts for the updated format and restores the previous functionality 🙂

Place back saved object client error formatting

dd6613f

jen-huang added v7.0.0 v6.5.0 labels Aug 13, 2018

jen-huang requested a review from nreese August 13, 2018 21:47

nreese reviewed Aug 13, 2018

View reviewed changes

Rename vars

a12a568

Change index pattern saving to read FetchError nested status code

2eaaa5b

jen-huang changed the title ~~Place back saved object client error formatting~~ Fix saving index pattern when there is a conflict Aug 13, 2018

nreese approved these changes Aug 13, 2018

View reviewed changes

Merge remote-tracking branch 'upstream/master' into fix/conflict-error

e94d34a

jen-huang merged commit 341d500 into elastic:master Aug 15, 2018

jen-huang deleted the fix/conflict-error branch August 15, 2018 05:21

jen-huang added a commit to jen-huang/kibana that referenced this pull request Aug 15, 2018

Fix saving index pattern when there is a conflict (elastic#21947)

ea413c0

jen-huang mentioned this pull request Aug 15, 2018

[6.x] Fix saving index pattern when there is a conflict (#21947) #21984

Merged

jen-huang added a commit that referenced this pull request Aug 15, 2018

Fix saving index pattern when there is a conflict (#21947) (#21984)

662ca26

jen-huang mentioned this pull request Aug 15, 2018

[6.4] Fix saving index pattern when there is a conflict (#21947) #22025

Merged

jen-huang added a commit to jen-huang/kibana that referenced this pull request Aug 15, 2018

Fix saving index pattern when there is a conflict (elastic#21947)

e81a66e

jen-huang added the v6.4.0 label Aug 15, 2018

LeeDr mentioned this pull request Aug 15, 2018

caching or versioning problem with multiple Kibana instances #7055

Closed

jen-huang added a commit that referenced this pull request Aug 15, 2018

Fix saving index pattern when there is a conflict (#21947) (#22025)

524cd5c

cjcenizal pushed a commit to cjcenizal/kibana that referenced this pull request Aug 21, 2018

Fix saving index pattern when there is a conflict (elastic#21947)

8fc04fd

cjcenizal pushed a commit to cjcenizal/kibana that referenced this pull request Aug 23, 2018

Fix saving index pattern when there is a conflict (elastic#21947)

79a6408

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix saving index pattern when there is a conflict #21947

Fix saving index pattern when there is a conflict #21947

jen-huang commented Aug 13, 2018 •

edited

Loading

nreese Aug 13, 2018

jen-huang Aug 13, 2018

nreese commented Aug 13, 2018

jen-huang commented Aug 13, 2018

nreese left a comment

elasticmachine commented Aug 14, 2018 •

edited by jen-huang

Loading

jen-huang commented Aug 14, 2018

elasticmachine commented Aug 14, 2018 •

edited by jen-huang

Loading

elasticmachine commented Aug 14, 2018 •

edited by jen-huang

Loading

jen-huang commented Aug 14, 2018

elasticmachine commented Aug 14, 2018

jen-huang commented Aug 15, 2018

elasticmachine commented Aug 15, 2018

LeeDr commented Aug 15, 2018

jen-huang commented Aug 15, 2018

Fix saving index pattern when there is a conflict #21947

Fix saving index pattern when there is a conflict #21947

Conversation

jen-huang commented Aug 13, 2018 • edited Loading

nreese Aug 13, 2018

Choose a reason for hiding this comment

jen-huang Aug 13, 2018

Choose a reason for hiding this comment

nreese commented Aug 13, 2018

jen-huang commented Aug 13, 2018

nreese left a comment

Choose a reason for hiding this comment

elasticmachine commented Aug 14, 2018 • edited by jen-huang Loading

💔 Build Failed

jen-huang commented Aug 14, 2018

elasticmachine commented Aug 14, 2018 • edited by jen-huang Loading

💔 Build Failed

elasticmachine commented Aug 14, 2018 • edited by jen-huang Loading

💔 Build Failed

jen-huang commented Aug 14, 2018

elasticmachine commented Aug 14, 2018

💔 Build Failed

jen-huang commented Aug 15, 2018

elasticmachine commented Aug 15, 2018

💚 Build Succeeded

LeeDr commented Aug 15, 2018

jen-huang commented Aug 15, 2018

jen-huang commented Aug 13, 2018 •

edited

Loading

elasticmachine commented Aug 14, 2018 •

edited by jen-huang

Loading

elasticmachine commented Aug 14, 2018 •

edited by jen-huang

Loading

elasticmachine commented Aug 14, 2018 •

edited by jen-huang

Loading