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

fix: flux error properly read by cloud #22348

Merged
merged 1 commit into from
Aug 31, 2021

Conversation

lesam
Copy link
Contributor

@lesam lesam commented Aug 31, 2021

Closes #22327

@lesam
Copy link
Contributor Author

lesam commented Aug 31, 2021

Before this change:

Screenshot 2021-08-31 at 10 33 06 AM

After this change:

Screenshot 2021-08-31 at 10 33 16 AM

assert.Equal(t, 403, resp.StatusCode)
body, err = ioutil.ReadAll(resp.Body)
require.NoError(t, err)
assert.Equal(t, `{"error":"Flux query service disabled. Verify flux-enabled=true in the [http] section of the InfluxDB config."}` + "\n", string(body))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Previously this was plaintext instead of json

func (m *mockPlanner) FullyCompacted() (bool, string) { return false, "not compacted" }
func (m *mockPlanner) ForceFull() {}
func (m *mockPlanner) SetFileStore(fs *tsm1.FileStore) {}
func (m *mockPlanner) PlanLevel(level int) ([]tsm1.CompactionGroup, int64) { return nil, 0 }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Looks like our formatting checks have some gaps...

@lesam lesam force-pushed the fix-flux-error branch 3 times, most recently from 1af8aac to 97498d9 Compare August 31, 2021 15:29
no_output_timeout: 1500s
- run:
name: Convert test output to junit
command: go-junit-report < tests.log > junit/influxdb.junit.xml
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Fix to always report which tests actually failed (especially when a test actually does fail).

@lesam lesam requested a review from gwossum August 31, 2021 15:58
Copy link
Member

@gwossum gwossum left a comment

Choose a reason for hiding this comment

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

Looks good to me. Pretty subtle change to get it to output JSON

@lesam lesam merged commit 38de69c into influxdata:master-1.x Aug 31, 2021
lesam added a commit to lesam/influxdb that referenced this pull request Sep 1, 2021
lesam added a commit to lesam/influxdb that referenced this pull request Sep 1, 2021
lesam added a commit that referenced this pull request Sep 1, 2021
chengshiwen pushed a commit to chengshiwen/influxdb that referenced this pull request Aug 27, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants