[
https://issues.apache.org/jira/browse/HDDS-2019?focusedWorklogId=320788&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-320788
]
ASF GitHub Bot logged work on HDDS-2019:
----------------------------------------
Author: ASF GitHub Bot
Created on: 30/Sep/19 19:25
Start Date: 30/Sep/19 19:25
Worklog Time Spent: 10m
Work Description: xiaoyuyao commented on pull request #1489: HDDS-2019.
Handle Set DtService of token in S3Gateway for OM HA.
URL: https://github.com/apache/hadoop/pull/1489#discussion_r329746422
##########
File path:
hadoop-ozone/s3gateway/src/test/java/org/apache/hadoop/ozone/s3/util/TestOzoneS3Util.java
##########
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ozone.s3.util;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.OmUtils;
+import org.apache.hadoop.ozone.om.OMConfigKeys;
+import org.apache.hadoop.security.SecurityUtil;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.Collection;
+
+import static
org.apache.hadoop.fs.CommonConfigurationKeys.HADOOP_SECURITY_TOKEN_SERVICE_USE_IP;
+import static org.junit.Assert.fail;
+
+/**
+ * Class used to test OzoneS3Util.
+ */
+public class TestOzoneS3Util {
+
+
+ private OzoneConfiguration configuration;
+
+ @Before
+ public void setConf() {
+ configuration = new OzoneConfiguration();
+ String serviceID = "omService";
+ String nodeIDs = "om1,om2,om3";
+ configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, serviceID);
+ configuration.set(OMConfigKeys.OZONE_OM_NODE_ID_KEY, nodeIDs);
+ configuration.setBoolean(HADOOP_SECURITY_TOKEN_SERVICE_USE_IP, false);
+ }
+
+ @Test
+ public void testBuildServiceNameForToken() {
+ String serviceID = "omService";
+ String nodeIDs = "om1,om2,om3";
+ configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, serviceID);
+ configuration.set(OMConfigKeys.OZONE_OM_NODE_ID_KEY, nodeIDs);
+ configuration.setBoolean(HADOOP_SECURITY_TOKEN_SERVICE_USE_IP, false);
+
+ Collection<String> nodeIDList = configuration.getStringCollection(
+ OMConfigKeys.OZONE_OM_NODE_ID_KEY);
+
+ String expectedOmServiceAddress = buildOMNodeAddresses(nodeIDList,
+ serviceID);
+
+ SecurityUtil.setConfiguration(configuration);
+ String omserviceAddr = OzoneS3Util.buildServiceNameForToken(configuration,
+ serviceID, nodeIDList);
+
+ Assert.assertEquals(expectedOmServiceAddress, omserviceAddr);
+ }
+
+ @Test
+ public void testBuildServiceNameForTokenIncorrectConfig() {
+ String serviceID = "omService";
+ String nodeIDs = "om1,om2,om3";
+ configuration.set(OMConfigKeys.OZONE_OM_SERVICE_IDS_KEY, serviceID);
+ configuration.set(OMConfigKeys.OZONE_OM_NODE_ID_KEY, nodeIDs);
+ configuration.setBoolean(HADOOP_SECURITY_TOKEN_SERVICE_USE_IP, false);
+
+ Collection<String> nodeIDList = configuration.getStringCollection(
+ OMConfigKeys.OZONE_OM_NODE_ID_KEY);
+
+ // Don't set om3 node rpc address.
+ configuration.set(OmUtils.addKeySuffixes(OMConfigKeys.OZONE_OM_ADDRESS_KEY,
+ serviceID, "om1"), "om1:9862");
+ configuration.set(OmUtils.addKeySuffixes(OMConfigKeys.OZONE_OM_ADDRESS_KEY,
+ serviceID, "om2"), "om2:9862");
+
+
+ SecurityUtil.setConfiguration(configuration);
+
+ try {
+ OzoneS3Util.buildServiceNameForToken(configuration,
+ serviceID, nodeIDList);
+ fail("testBuildServiceNameForTokenIncorrectConfig failed");
+ } catch (IllegalArgumentException ex) {
+ GenericTestUtils.assertExceptionContains("Could not find rpcAddress " +
+ "for", ex);
+ }
+
+
+ }
+
+
+ private String buildOMNodeAddresses(Collection<String> nodeIDList,
+ String serviceID) {
+ StringBuilder omServiceAddrBuilder = new StringBuilder();
+ int port = 9862;
+ int nodesLength = nodeIDList.size();
+ int counter = 0;
+ for (String nodeID : nodeIDList) {
+ counter++;
+ String addr = nodeID + ":" + port++;
+ configuration.set(OmUtils.addKeySuffixes(
+ OMConfigKeys.OZONE_OM_ADDRESS_KEY, serviceID, nodeID), addr);
Review comment:
NIT: This helper not only makes and returns the address, but also changes
the configuration implicitly. Suggest add some comments to help understand the
difference between the two test cases.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 320788)
Time Spent: 3h 10m (was: 3h)
> Handle Set DtService of token in S3Gateway for OM HA
> ----------------------------------------------------
>
> Key: HDDS-2019
> URL: https://issues.apache.org/jira/browse/HDDS-2019
> Project: Hadoop Distributed Data Store
> Issue Type: Sub-task
> Reporter: Bharat Viswanadham
> Assignee: Bharat Viswanadham
> Priority: Critical
> Labels: pull-request-available
> Time Spent: 3h 10m
> Remaining Estimate: 0h
>
> When OM HA is enabled, when tokens are generated, the service name should be
> set with address of all OM's.
>
> Current without HA, it is set with Om RpcAddress string. This Jira is to
> handle:
> # Set dtService with all OM address. Right now in OMClientProducer, UGI is
> created with S3 token, and serviceName of token is set with OMAddress, for HA
> case, this should be set with all OM RPC addresses.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: hdfs-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: hdfs-issues-h...@hadoop.apache.org
