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.

Sign up for GitHub

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

Jump to bottom

Fix bug, using basic instead of basicauth #2342

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Fix bug, using basic instead of basicauth #2342

merged 4 commits into from
Oct 24, 2023

Conversation

penghuo
Copy link
Collaborator

@penghuo penghuo commented Oct 23, 2023 •
edited
Loading

Description

  1. Align with Flint auth conf, use basic instead of basicauth. https://github.com/opensearch-project/opensearch-spark/blob/main/docs/index.md#basic-auth
  2. Change Interactive timeout to 0.
  3. Fetch error from statementDoc in case not result write to indexResult yet.
  4. Add IT for (1), (2), (3)

Issues Resolved

n/a

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

@penghuo
fix codestyle
d47c963 
Signed-off-by: Peng Huo <[email protected]>
@codecov
Copy link

codecov bot commented Oct 23, 2023 •
edited
Loading

Codecov Report

Merging #2342 (7f7390e) into main (b30d3c9) will decrease coverage by 0.04%.
Report is 1 commits behind head on main.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##               main    #2342      +/-   ##
============================================
- Coverage     96.49%   96.46%   -0.04%     
- Complexity     4891     4898       +7     
============================================
  Files           463      464       +1     
  Lines         13365    13421      +56     
  Branches        901      903       +2     
============================================
+ Hits          12896    12946      +50     
- Misses          452      456       +4     
- Partials         17       19       +2
Flag Coverage Δ
sql-engine 96.46% <100.00%> (-0.04%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
.../spark/asyncquery/model/SparkSubmitParameters.java 100.00% <100.00%> (ø)
.../sql/spark/dispatcher/InteractiveQueryHandler.java 100.00% <100.00%> (ø)
.../spark/execution/session/CreateSessionRequest.java 100.00% <100.00%> (ø)

... and 4 files with indirect coverage changes

@penghuo penghuo self-assigned this Oct 23, 2023
dai-chen
dai-chen previously approved these changes Oct 23, 2023
View reviewed changes
vmmusings
vmmusings previously approved these changes Oct 23, 2023
View reviewed changes
@penghuo penghuo dismissed stale reviews from vmmusings and dai-chen via c61027b October 23, 2023 23:25
@penghuo
fix UT
7f7390e 
Signed-off-by: Peng Huo <[email protected]>
@penghuo penghuo merged commit a27e733 into opensearch-project:main Oct 24, 2023
20 of 21 checks passed
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 24, 2023
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 24, 2023
@github-actions
Fix bug, using basic instead of basicauth (#2342)
f1c8c53 
* Fix bug, using basic instead of basicauth

Signed-off-by: Peng Huo <[email protected]>

* fix codestyle

Signed-off-by: Peng Huo <[email protected]>

* fix IT failure: datasourceWithBasicAuth

Signed-off-by: Peng Huo <[email protected]>

* fix UT

Signed-off-by: Peng Huo <[email protected]>

---------

Signed-off-by: Peng Huo <[email protected]>
(cherry picked from commit a27e733)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 25, 2023
@github-actions
Fix bug, using basic instead of basicauth (#2342)
fa1f035 
* Fix bug, using basic instead of basicauth

Signed-off-by: Peng Huo <[email protected]>

* fix codestyle

Signed-off-by: Peng Huo <[email protected]>

* fix IT failure: datasourceWithBasicAuth

Signed-off-by: Peng Huo <[email protected]>

* fix UT

Signed-off-by: Peng Huo <[email protected]>

---------

Signed-off-by: Peng Huo <[email protected]>
(cherry picked from commit a27e733)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 25, 2023
Merged
penghuo pushed a commit that referenced this pull request Oct 25, 2023
@opensearch-trigger-bot @github-actions
Fix bug, using basic instead of basicauth (#2342) (#2355)
e4827a5 
* Fix bug, using basic instead of basicauth



* fix codestyle



* fix IT failure: datasourceWithBasicAuth



* fix UT



---------


(cherry picked from commit a27e733)

Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
penghuo added a commit that referenced this pull request Oct 25, 2023
@opensearch-trigger-bot @github-actions @penghuo
Fix bug, using basic instead of basicauth (#2342) (#2348)
9085c5c 
* Fix bug, using basic instead of basicauth



* fix codestyle



* fix IT failure: datasourceWithBasicAuth



* fix UT



---------


(cherry picked from commit a27e733)

Signed-off-by: Peng Huo <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Peng Huo <[email protected]>
mengweieric added a commit to mengweieric/sql that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Fix bug, using basic instead of basicauth (opensearch-project…
35adfff 
…#2342) (opensearch-project#2355)"

This reverts commit e4827a5.

Signed-off-by: Eric <[email protected]>
mengweieric added a commit to mengweieric/sql that referenced this pull request Nov 8, 2023
@mengweieric
Revert "Fix bug, using basic instead of basicauth (opensearch-project…
14a2fba 
…#2342) (opensearch-project#2355)"

This reverts commit e4827a5.

Signed-off-by: Eric <[email protected]>
vmmusings added a commit to mengweieric/sql that referenced this pull request Nov 13, 2023
@vmmusings
Revert "Fix bug, using basic instead of basicauth (opensearch-project…
11d351f 
…#2342) (opensearch-project#2355)"

This reverts commit e4827a5.
vmmusings added a commit that referenced this pull request Nov 13, 2023
@mengweieric @vmmusings
Revert commits back to after 2.11 release (#2427)
62d3940 
* Revert "Add more metrics and handle emr exception message (#2422) (#2426)"

This reverts commit b57f7cc.

* Revert "Block settings in sql query settings API and add more unit tests (#2407) (#2412)"

This reverts commit 3024737.

* Revert "Added session, statement, emrjob metrics to sql stats api (#2398) (#2400)"

This reverts commit 6e17ae6.

* Revert "Redefine Drop Index as logical delete (#2386) (#2397)"

This reverts commit e939bb6.

* Revert "add concurrent limit on datasource and sessions (#2390) (#2395)"

This reverts commit deb3ccf.

* Revert "Add Flint Index Purging Logic (#2372) (#2389)"

This reverts commit dd48b9b.

* Revert "Refactoring for tags usage in test files and also added explicit denly list setting. (#2383) (#2385)"

This reverts commit 37e010f.

* Revert "Enable session by default (#2373) (#2375)"

This reverts commit 7d95e4c.

* Revert "Create new session if client provided session is invalid (#2368) (#2371)"

This reverts commit 5ab7858.

* Revert "Add where clause support in create statement (#2366) (#2370)"

This reverts commit b620a56.

* Revert "create new session if current session not ready (#2363) (#2365)"

This reverts commit 5d07281.

* Revert "Handle Describe,Refresh and Show Queries Properly (#2357) (#2362)"

This reverts commit 16e2f30.

* Revert "Add Session limitation (#2354) (#2359)"

This reverts commit 0f334f8.

* Revert "Bug Fix, support cancel query in running state (#2351) (#2353)"

This reverts commit 9a40591.

* Revert "Fix bug, using basic instead of basicauth (#2342) (#2355)"

This reverts commit e4827a5.

* Revert "Add missing tags and MV support (#2336) (#2346)"

This reverts commit 8791bb0.

* Revert "[Backport 2.x] deprecated job-metadata-index (#2340) (#2343)"

This reverts commit bea432c.

* Revert "Integration with REPL Spark job (#2327) (#2338)"

This reverts commit 58a5ae5.

* Revert "Implement patch API for datasources (#2273) (#2329)"

This reverts commit 4c151fe.

* Revert "Add sessionId parameters for create async query API (#2312) (#2324)"

This reverts commit 3d1a376.

* Revert "Add Statement (#2294) (#2318) (#2319)"

This reverts commit b3c2e94.

* Revert "Upgrade json (#2307) (#2314)"

This reverts commit 6c65bb4.

* Revert "Minor Refactoring (#2308) (#2317)"

This reverts commit 051cc4f.

* Revert "add InteractiveSession and SessionManager (#2290) (#2293) (#2315)"

This reverts commit 6ac197b.

---------

Co-authored-by: Vamsi Manohar <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dai-chen dai-chen dai-chen approved these changes

@kaituo kaituo kaituo approved these changes

@vmmusings vmmusings vmmusings left review comments

@pjfitzgibbons pjfitzgibbons Awaiting requested review from pjfitzgibbons

@ps48 ps48 Awaiting requested review from ps48 ps48 is a code owner

@kavithacm kavithacm Awaiting requested review from kavithacm kavithacm is a code owner

@derek-ho derek-ho Awaiting requested review from derek-ho derek-ho is a code owner

@joshuali925 joshuali925 Awaiting requested review from joshuali925 joshuali925 is a code owner

@YANG-DB YANG-DB Awaiting requested review from YANG-DB YANG-DB is a code owner

@rupal-bq rupal-bq Awaiting requested review from rupal-bq

@mengweieric mengweieric Awaiting requested review from mengweieric mengweieric is a code owner

@Swiddis Swiddis Awaiting requested review from Swiddis Swiddis is a code owner

@seankao-az seankao-az Awaiting requested review from seankao-az seankao-az is a code owner

@MaxKsyunz MaxKsyunz Awaiting requested review from MaxKsyunz MaxKsyunz is a code owner

@Yury-Fridlyand Yury-Fridlyand Awaiting requested review from Yury-Fridlyand Yury-Fridlyand is a code owner

@anirudha anirudha Awaiting requested review from anirudha anirudha is a code owner

@forestmvey forestmvey Awaiting requested review from forestmvey forestmvey is a code owner

@acarbonetto acarbonetto Awaiting requested review from acarbonetto acarbonetto is a code owner

@GumpacG GumpacG Awaiting requested review from GumpacG GumpacG is a code owner

Assignees

@penghuo penghuo

Labels
backport 2.x backport 2.11
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@penghuo @kaituo @dai-chen @vmmusings