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 Registry Manager to support multi-tenancy and OpenSearch Serverless #73

Merged
merged 15 commits into from
Jul 5, 2024

Conversation

al-niessner
Copy link
Contributor

@al-niessner al-niessner commented Jan 30, 2024

🗒️ Summary

Adapt to new registry-common

⚙️ Test Data and/or Report

TBD

♻️ Related Issues

Closes #66

@al-niessner al-niessner self-assigned this Jan 30, 2024
@al-niessner al-niessner requested a review from a team as a code owner January 30, 2024 23:48
@al-niessner al-niessner marked this pull request as draft January 30, 2024 23:48
Al Niessner added 9 commits February 9, 2024 15:03
The only think to note here, is that arg value changes but everything else remains the same. Instead of https://localhost:9200 will be app://localhost.xml.
Should have separated all of the get/search parts and everything that is es or os is now in registry-common.
@jordanpadams jordanpadams changed the title 66: updates for multitenacy Update Registry Manager to support multi-tenancy and OpenSearch Serverless Apr 23, 2024
@tloubrieu-jpl
Copy link
Member

Hi @al-niessner , the branch issue_66 here is meant to work with branch issue_36 of registry-common ?

If yes, the pom.xml in this repository should reference dependency on registry-common 1.6.0-SNAPSHOT, but it does not. Can you help me with that ?

Thanks

@al-niessner
Copy link
Contributor Author

al-niessner commented Apr 24, 2024

Hi @al-niessner , the branch issue_66 here is meant to work with branch issue_36 of registry-common ?

If yes, the pom.xml in this repository should reference dependency on registry-common 1.6.0-SNAPSHOT, but it does not. Can you help me with that ?

Thanks

@tloubrieu-jpl

Yes these 3 PRs work together:

POM updated. When you have this new snapshot let me know and I will update the harvest POM for both common and mgr.

@tloubrieu-jpl
Copy link
Member

tloubrieu-jpl commented Apr 24, 2024

Hi @al-niessner ,

I build registry-common from branch issue_36
I switched the dependency on registry-common to 1.6.0-SNAPSHOT in the pom.xml here.
I tried to build registry-mgr, and I am getting these errors:

[INFO] -------------------------------------------------------------
[ERROR] COMPILATION ERROR : 
[INFO] -------------------------------------------------------------
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/dao/DataExporter.java:[12,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/dao/DataExporter.java:[13,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/dao/DataExporter.java:[14,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/UpdateAltIdsCmd.java:[19,40] package gov.nasa.pds.registry.common.cfg does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/UpdateAltIdsCmd.java:[20,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/dd/DeleteDDCmd.java:[16,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/dd/DeleteDDCmd.java:[17,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/dd/LoadDDCmd.java:[8,40] package gov.nasa.pds.registry.common.cfg does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/dd/LoadDDCmd.java:[30,13] cannot find symbol
  symbol:   class RegistryCfg
  location: class gov.nasa.pds.registry.mgr.cmd.dd.LoadDDCmd
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/DeleteDataCmd.java:[16,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/DeleteDataCmd.java:[17,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/dao/RegistryManager.java:[7,40] package gov.nasa.pds.registry.common.cfg does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/dao/RegistryManager.java:[33,29] cannot find symbol
  symbol:   class RegistryCfg
  location: class gov.nasa.pds.registry.mgr.dao.RegistryManager
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/dao/RegistryManager.java:[60,29] cannot find symbol
  symbol:   class RegistryCfg
  location: class gov.nasa.pds.registry.mgr.dao.RegistryManager
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/util/es/EsDocWriter.java:[12,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/util/es/EsDocWriter.java:[30,68] package SearchResponseParser does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/dd/ListDDCmd.java:[8,40] package gov.nasa.pds.registry.common.cfg does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/ExportFileCmd.java:[11,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/ExportFileCmd.java:[12,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/ExportFileCmd.java:[13,46] package gov.nasa.pds.registry.common.es.client does not exist
[ERROR] /Users/loubrieu/git/registry-mgr/src/main/java/gov/nasa/pds/registry/mgr/cmd/data/ExportFileCmd.java:[33,68] package SearchResponseParser does not exist
[INFO] 21 errors 

I am not finding the classes missing in the branch issue_36 of registry-common.

Thanks

@al-niessner
Copy link
Contributor Author

al-niessner commented Apr 24, 2024 via email

@tloubrieu-jpl
Copy link
Member

Hi @al-niessner ,

I am building the registry-common locally and it is deployed locally in my .m2 repository.

@tloubrieu-jpl
Copy link
Member

Hi @al-niessner ,

I tried the set-archive-status subcommand but that did not work, see my terminal here with 2 attempts:

% ./bin/registry-manager set-archive-status -index jaxa-registry -auth /Users/loubrieu/Documents/pds/registry/es-auth.txt -es file:/Users/loubrieu/Documents/pds/registry/mcp_dev.xml -lidvid urn:nasa:pds:insight_rad:data_derived::7.0 -status archived 
SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
[INFO] Setting product status. LIDVID = urn:nasa:pds:insight_rad:data_derived::7.0, status = archived
[ERROR] Request failed: [http_exception] server returned 404
loubrieu@MT-212318 registry-manager-4.7.0-SNAPSHOT % ./bin/registry-manager set-archive-status -auth /Users/loubrieu/Documents/pds/registry/es-auth.txt -es file:/Users/loubrieu/Documents/pds/registry/mcp_dev.xml -lidvid urn:nasa:pds:insight_rad:data_derived::7.0 -status archived 

SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder".
SLF4J: Defaulting to no-operation (NOP) logger implementation
SLF4J: See http://www.slf4j.org/codes.html#StaticLoggerBinder for further details.
[INFO] Setting product status. LIDVID = urn:nasa:pds:insight_rad:data_derived::7.0, status = archived
[ERROR] Request failed: [http_exception] server returned 404
loubrieu@MT-212318 registry-manager-4.7.0-SNAPSHOT % 

Before I merge the PR, can you also resolve the current conflict with the main branch ?

Thanks,

Thomas

@al-niessner
Copy link
Contributor Author

@tloubrieu-jpl

How did you resolve conflict from main branch for the status subject?

@tloubrieu-jpl
Copy link
Member

Hi @al-niessner ,

I don't understand your question.

I did not resolve the conflict but I was asking if you could do it, by rebasing your development branch on main. And as an independent request from me, I was also asking if you could fix the error when using the set-archive-status subcommand.

Let me know what I missed.

Thanks

@al-niessner
Copy link
Contributor Author

@tloubrieu-jpl

Fix for status is waiting for you in PR NASA-PDS/registry-common#49. Merge is complete.

Copy link
Member

@tloubrieu-jpl tloubrieu-jpl left a comment

Choose a reason for hiding this comment

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

I am approving although there are remaining know bugs.

@al-niessner al-niessner merged commit 14f8f06 into main Jul 5, 2024
4 checks passed
@al-niessner al-niessner deleted the issue_66 branch July 5, 2024 17:14
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.

Update to utilize new multi-tenancy approach
2 participants