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

Update PA directories from plugins to root #1987

Merged
merged 1 commit into from
Apr 19, 2022

Conversation

sruti1312
Copy link
Contributor

@sruti1312 sruti1312 commented Apr 18, 2022

Signed-off-by: sruti1312 [email protected]

Description

OpenSearch moves the plugins config and bin directories into root bin and config folder. This behaviour is similar with all plugins and the expected behaviour. Modifying all PA locations to new root directory location.

Issues Resolved

opensearch-project/OpenSearch#2963

Check List

  • 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.

Copy link
Member

@saratvemulapalli saratvemulapalli 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.

ARG PERFORMANCE_ANALYZER_PLUGIN_DIR=$OPENSEARCH_HOME/plugins/opensearch-performance-analyzer
ARG PERFORMANCE_ANALYZER_PLUGIN_NAME=opensearch-performance-analyzer
Copy link
Member

Choose a reason for hiding this comment

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

Better way:



ARG PERFORMANCE_ANALYZER_PLUGIN_NAME=opensearch-performance-analyzer

ARG PERFORMANCE_ANALYZER_PLUGIN_DIR=$OPENSEARCH_HOME/plugins/$PERFORMANCE_ANALYZER_PLUGIN_NAME

Copy link
Member

Choose a reason for hiding this comment

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

@sruti1312 I notice that PERFORMANCE_ANALYZER_PLUGIN_DIR is not even used anymore, if you can confirm that please remove it.

Thanks.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

That is the wrong location isnt it?

$PERFORMANCE_ANALYZER_PLUGIN_DIR/config/

It resolved to plugins/PA/config which you have already moved to config/PA

Copy link
Contributor Author

Choose a reason for hiding this comment

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

if [[ -d $PERFORMANCE_ANALYZER_PLUGIN_DIR ]] ; then cp -v $TEMP_DIR/performance-analyzer.properties $OPENSEARCH_HOME/config/$PERFORMANCE_ANALYZER_PLUGIN_NAME/; fi && \

It checks for the plugins directory (which will be present if PA is installed), then copies into the config folder. Check can be modified to the config directory directly.

https:/sruti1312/opensearch-build/blob/feature/pa-files/docker/release/dockerfiles/opensearch.al2.dockerfile#L43

@sruti1312 sruti1312 force-pushed the feature/pa-files branch 2 times, most recently from 9c93187 to fa8c1a2 Compare April 18, 2022 23:45
Copy link
Member

@peterzhuamazon peterzhuamazon left a comment

Choose a reason for hiding this comment

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

Block as there are still many issues.

@codecov-commenter
Copy link

codecov-commenter commented Apr 19, 2022

Codecov Report

Merging #1987 (e0c9c60) into main (7c732e9) will not change coverage.
The diff coverage is n/a.

@@            Coverage Diff            @@
##               main    #1987   +/-   ##
=========================================
  Coverage     94.41%   94.41%           
  Complexity       22       22           
=========================================
  Files           187      187           
  Lines          3739     3739           
  Branches         29       29           
=========================================
  Hits           3530     3530           
  Misses          203      203           
  Partials          6        6           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 7c732e9...e0c9c60. Read the comment docs.

@peterzhuamazon peterzhuamazon merged commit 6183df2 into opensearch-project:main Apr 19, 2022
@dblock
Copy link
Member

dblock commented Apr 19, 2022

@davidlago Did we do anything here differently between security and PA?

@davidlago
Copy link

@DarshitChanpura @cliu123 could you please confirm things are working as expected after the changes here? I see we did move the config folder outside of the plugins folder. See issue here (thanks @dblock, I was unaware of that issue)

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.

6 participants