-
Notifications
You must be signed in to change notification settings - Fork 587
HDDS-11371. Handle cases where OM does not have getServerDefaults() implemented. #7130
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
d3640ae
HDDS-11371. Added xcompat tests to check for regressions in secure cl…
d2b6c36
HDDS-11371. Added license for xcompat/secure-docker-config
fabcae6
HDDS-11371. Fixed secure old cluster setup in xcompat tests.
8181a17
HDDS-11371. Handled cases where OM does not have getServerDeaults() i…
85daf08
HDDS-11371. Fixed acceptance test errors. Added Om version for getSer…
c611fc3
HDDS-11371. Added newline to test-secure.sh
eb9c9f4
HDDS-11371. Added error handling in getServerDefaults() and fixed acc…
0810ff5
HDDS-11371. Reusing OM service info to get server defaults instead of…
17ed468
Merge branch 'apache:master' into HDDS-11371
SaketaChalamchala e294138
Merge branch 'apache:master' into HDDS-11371
SaketaChalamchala cecaaad
HDDS-11371. Exiting loop after first non-null loop in RpcClient.getSe…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,6 +14,8 @@ | |
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| CORE-SITE.XML_fs.defaultFS=ofs://om | ||
| CORE-SITE.XML_fs.trash.interval=1 | ||
| CORE-SITE.XML_fs.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzoneFileSystem | ||
|
|
||
| OZONE-SITE.XML_hdds.datanode.dir=/data/hdds | ||
|
|
@@ -22,6 +24,7 @@ OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3 | |
| OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata | ||
| OZONE-SITE.XML_ozone.om.address=om | ||
| OZONE-SITE.XML_ozone.om.http-address=om:9874 | ||
| OZONE-SITE.XML_ozone.scm.http-address=scm:9876 | ||
| OZONE-SITE.XML_ozone.recon.address=recon:9891 | ||
| OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon | ||
| OZONE-SITE.XML_ozone.server.default.replication=3 | ||
|
|
@@ -31,9 +34,98 @@ OZONE-SITE.XML_ozone.scm.container.size=1GB | |
| OZONE-SITE.XML_ozone.scm.datanode.ratis.volume.free-space.min=10MB | ||
| OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data | ||
| OZONE-SITE.XML_ozone.scm.names=scm | ||
| OZONE-SITE.XML_ozone.scm.pipeline.creation.interval=30s | ||
| OZONE-SITE.XML_ozone.scm.pipeline.owner.container.count=1 | ||
| OZONE-SITE.XML_ozone.datanode.pipeline.limit=1 | ||
| OZONE-SITE.XML_recon.om.snapshot.task.interval.delay=1m | ||
| OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s | ||
| OZONE-SITE.XML_ozone.default.bucket.layout=LEGACY | ||
| OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http | ||
| no_proxy=om,recon,scm,s3g,kdc,localhost,127.0.0.1 | ||
|
|
||
| OZONE-SITE.XML_hdds.block.token.enabled=true | ||
| OZONE-SITE.XML_hdds.container.token.enabled=true | ||
| OZONE-SITE.XML_hdds.grpc.tls.enabled=true | ||
|
|
||
| OZONE-SITE.XML_ozone.security.enabled=true | ||
| OZONE-SITE.XML_ozone.acl.enabled=true | ||
| OZONE-SITE.XML_ozone.acl.authorizer.class=org.apache.hadoop.ozone.security.acl.OzoneNativeAuthorizer | ||
| OZONE-SITE.XML_ozone.administrators="testuser,recon,om" | ||
| OZONE-SITE.XML_ozone.s3.administrators="testuser,recon,om" | ||
| OZONE-SITE.XML_ozone.recon.administrators="testuser2" | ||
| OZONE-SITE.XML_ozone.s3.administrators="testuser,s3g" | ||
|
|
||
| HDFS-SITE.XML_dfs.datanode.address=0.0.0.0:1019 | ||
| HDFS-SITE.XML_dfs.datanode.http.address=0.0.0.0:1012 | ||
| CORE-SITE.XML_dfs.data.transfer.protection=authentication | ||
| CORE-SITE.XML_hadoop.security.authentication=kerberos | ||
| CORE-SITE.XML_hadoop.security.auth_to_local="DEFAULT" | ||
| CORE-SITE.XML_hadoop.security.key.provider.path=kms://http@kms:9600/kms | ||
|
|
||
| OZONE-SITE.XML_hdds.scm.kerberos.principal=scm/[email protected] | ||
| OZONE-SITE.XML_hdds.scm.kerberos.keytab.file=/etc/security/keytabs/scm.keytab | ||
| OZONE-SITE.XML_ozone.om.kerberos.principal=om/[email protected] | ||
| OZONE-SITE.XML_ozone.om.kerberos.keytab.file=/etc/security/keytabs/om.keytab | ||
| OZONE-SITE.XML_ozone.recon.kerberos.keytab.file=/etc/security/keytabs/recon.keytab | ||
| OZONE-SITE.XML_ozone.recon.kerberos.principal=recon/[email protected] | ||
|
|
||
| OZONE-SITE.XML_ozone.s3g.kerberos.keytab.file=/etc/security/keytabs/s3g.keytab | ||
| OZONE-SITE.XML_ozone.s3g.kerberos.principal=s3g/[email protected] | ||
|
|
||
| OZONE-SITE.XML_ozone.httpfs.kerberos.keytab.file=/etc/security/keytabs/httpfs.keytab | ||
| OZONE-SITE.XML_ozone.httpfs.kerberos.principal=httpfs/[email protected] | ||
|
|
||
| HDFS-SITE.XML_dfs.datanode.kerberos.principal=dn/[email protected] | ||
| HDFS-SITE.XML_dfs.datanode.keytab.file=/etc/security/keytabs/dn.keytab | ||
| HDFS-SITE.XML_dfs.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab | ||
| HDFS-SITE.XML_dfs.web.authentication.kerberos.principal=HTTP/[email protected] | ||
| HDFS-SITE.XML_dfs.web.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab | ||
|
|
||
| OZONE-SITE.XML_ozone.security.http.kerberos.enabled=true | ||
| OZONE-SITE.XML_ozone.s3g.secret.http.enabled=true | ||
| OZONE-SITE.XML_ozone.http.filter.initializers=org.apache.hadoop.security.AuthenticationFilterInitializer | ||
|
|
||
| OZONE-SITE.XML_ozone.om.http.auth.type=kerberos | ||
| OZONE-SITE.XML_hdds.scm.http.auth.type=kerberos | ||
| OZONE-SITE.XML_hdds.datanode.http.auth.type=kerberos | ||
| OZONE-SITE.XML_ozone.s3g.http.auth.type=kerberos | ||
| OZONE-SITE.XML_ozone.s3g.secret.http.auth.type=kerberos | ||
| OZONE-SITE.XML_ozone.httpfs.http.auth.type=kerberos | ||
| OZONE-SITE.XML_ozone.recon.http.auth.type=kerberos | ||
|
|
||
| OZONE-SITE.XML_hdds.scm.http.auth.kerberos.principal=HTTP/[email protected] | ||
| OZONE-SITE.XML_hdds.scm.http.auth.kerberos.keytab=/etc/security/keytabs/scm.keytab | ||
| OZONE-SITE.XML_ozone.om.http.auth.kerberos.principal=HTTP/[email protected] | ||
| OZONE-SITE.XML_ozone.om.http.auth.kerberos.keytab=/etc/security/keytabs/om.keytab | ||
| OZONE-SITE.XML_hdds.datanode.http.auth.kerberos.principal=HTTP/[email protected] | ||
| OZONE-SITE.XML_hdds.datanode.http.auth.kerberos.keytab=/etc/security/keytabs/dn.keytab | ||
| OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.keytab=/etc/security/keytabs/s3g.keytab | ||
| OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.principal=HTTP/[email protected] | ||
| OZONE-SITE.XML_ozone.httpfs.http.auth.kerberos.keytab=/etc/security/keytabs/httpfs.keytab | ||
| OZONE-SITE.XML_ozone.httpfs.http.auth.kerberos.principal=HTTP/[email protected] | ||
| OZONE-SITE.XML_ozone.recon.http.auth.kerberos.principal=* | ||
| OZONE-SITE.XML_ozone.recon.http.auth.kerberos.keytab=/etc/security/keytabs/recon.keytab | ||
|
|
||
| CORE-SITE.XML_hadoop.http.authentication.simple.anonymous.allowed=false | ||
| CORE-SITE.XML_hadoop.http.authentication.signature.secret.file=/etc/security/http_secret | ||
| CORE-SITE.XML_hadoop.http.authentication.type=kerberos | ||
| CORE-SITE.XML_hadoop.http.authentication.kerberos.principal=HTTP/[email protected] | ||
| CORE-SITE.XML_hadoop.http.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab | ||
|
|
||
| CORE-SITE.XML_hadoop.security.authorization=true | ||
| HADOOP-POLICY.XML_ozone.om.security.client.protocol.acl=* | ||
| HADOOP-POLICY.XML_hdds.security.client.datanode.container.protocol.acl=* | ||
| HADOOP-POLICY.XML_hdds.security.client.scm.container.protocol.acl=* | ||
| HADOOP-POLICY.XML_hdds.security.client.scm.block.protocol.acl=* | ||
| HADOOP-POLICY.XML_hdds.security.client.scm.certificate.protocol.acl=* | ||
| HADOOP-POLICY.XML_ozone.security.reconfigure.protocol.acl=* | ||
|
|
||
| KMS-SITE.XML_hadoop.kms.proxyuser.s3g.users=* | ||
| KMS-SITE.XML_hadoop.kms.proxyuser.s3g.groups=* | ||
| KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=* | ||
|
|
||
| OZONE_DATANODE_SECURE_USER=root | ||
| JSVC_HOME=/usr/bin | ||
|
|
||
| OZONE_LOG_DIR=/var/log/hadoop | ||
|
|
||
| no_proxy=om,scm,recon,s3g,kdc,localhost,127.0.0.1 | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: Should it exit the loop after first non-
nullserver defaults found?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, I made the change. Thanks @adoroszlai