You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by GitBox <gi...@apache.org> on 2020/04/14 22:52:44 UTC
[GitHub] [hadoop-ozone] smengcl opened a new pull request #821: HDDS-3374.
Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
smengcl opened a new pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821
## What changes were proposed in this pull request?
The previous PR #806 's unit test didn't expose the potential NPE issue that the removed integration test would have exposed: the flushFuture isn't set so [this line](https://github.com/apache/hadoop-ozone/blob/1ceb51477e0bb7f44204ba8ea98d7e409277a748/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerProtocolServerSideTranslatorPB.java#L218) would raise NPE.
## What is the link to the Apache JIRA
https://issues.apache.org/jira/browse/HDDS-3374
## How was this patch tested?
Would add back the integration test if needed.
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] smengcl commented on a change in pull request #821:
HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
smengcl commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408546667
##########
File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
##########
@@ -241,6 +242,19 @@ public void testOMClientProxyProvider() {
ozoneManager.getOmRpcServerAddr()));
}
+ @Test
+ public void testVolumeSetOwner() throws IOException {
+ String volumeName = UUID.randomUUID().toString();
+ store.createVolume(volumeName);
+
+ String ownerName = "someRandomUser1";
+
+ ClientProtocol proxy = store.getClientProxy();
+ proxy.setVolumeOwner(volumeName, ownerName);
+ // Set owner again. Expect no NPEs nor timeouts
Review comment:
well, my intention is to remind someone in the future in case this breaks again by some new code.
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] smengcl commented on a change in pull request #821:
HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
smengcl commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408546667
##########
File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
##########
@@ -241,6 +242,19 @@ public void testOMClientProxyProvider() {
ozoneManager.getOmRpcServerAddr()));
}
+ @Test
+ public void testVolumeSetOwner() throws IOException {
+ String volumeName = UUID.randomUUID().toString();
+ store.createVolume(volumeName);
+
+ String ownerName = "someRandomUser1";
+
+ ClientProtocol proxy = store.getClientProxy();
+ proxy.setVolumeOwner(volumeName, ownerName);
+ // Set owner again. Expect no NPEs nor timeouts
Review comment:
yep my intention is to remind someone in the future in case this breaks again by some new code.
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] smengcl merged pull request #821: HDDS-3374.
Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
Posted by GitBox <gi...@apache.org>.
smengcl merged pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] bharatviswa504 commented on a change in pull request
#821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
bharatviswa504 commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408536061
##########
File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
##########
@@ -241,6 +242,19 @@ public void testOMClientProxyProvider() {
ozoneManager.getOmRpcServerAddr()));
}
+ @Test
+ public void testVolumeSetOwner() throws IOException {
+ String volumeName = UUID.randomUUID().toString();
+ store.createVolume(volumeName);
+
+ String ownerName = "someRandomUser1";
+
+ ClientProtocol proxy = store.getClientProxy();
+ proxy.setVolumeOwner(volumeName, ownerName);
+ // Set owner again. Expect no NPEs nor timeouts
Review comment:
Minor NIT: We don't need this comment, as this PR fixes the bug in the code :)
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] smengcl commented on a change in pull request #821:
HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
smengcl commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408552038
##########
File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientAbstract.java
##########
@@ -241,6 +242,19 @@ public void testOMClientProxyProvider() {
ozoneManager.getOmRpcServerAddr()));
}
+ @Test
+ public void testVolumeSetOwner() throws IOException {
+ String volumeName = UUID.randomUUID().toString();
+ store.createVolume(volumeName);
+
+ String ownerName = "someRandomUser1";
+
+ ClientProtocol proxy = store.getClientProxy();
+ proxy.setVolumeOwner(volumeName, ownerName);
+ // Set owner again. Expect no NPEs nor timeouts
Review comment:
Revised comment.
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] bharatviswa504 commented on a change in pull request
#821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
bharatviswa504 commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408503405
##########
File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java
##########
@@ -147,18 +145,20 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
.setMessage(
"Volume '" + volume + "' owner is already '" + newOwner + "'.")
.setSuccess(false);
- return new OMVolumeSetOwnerResponse(omResponse.build());
+ omResponse.setSetVolumePropertyResponse(
+ SetVolumePropertyResponse.newBuilder().build());
+ omClientResponse = new OMVolumeSetOwnerResponse(omResponse.build());
+ addResponseToDoubleBuffer(transactionLogIndex, omClientResponse,
+ ozoneManagerDoubleBufferHelper);
+ return omClientResponse;
Review comment:
Instead of return response here, set it to omClientResponse, and let finally block take care of it.
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] bharatviswa504 commented on a change in pull request
#821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
bharatviswa504 commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408503216
##########
File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerSetOwner.java
##########
@@ -0,0 +1,104 @@
+/**
+ * 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.om;
+
+import java.util.UUID;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.MiniOzoneCluster;
+import org.apache.hadoop.ozone.client.ObjectStore;
+import org.apache.hadoop.ozone.client.OzoneClient;
+import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
+
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_MAX_RETRIES_KEY;
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_RETRY_INTERVAL_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_RATIS_PIPELINE_LIMIT;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS_NATIVE;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Timeout;
+
+/**
+ * Test OzoneManager setOwner command.
+ */
+public class TestOzoneManagerSetOwner {
+
+ @Rule
+ public Timeout timeout = new Timeout(120_000);
+
+ /**
Review comment:
Can we add this test in TestOzoneRpcClient?
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] smengcl commented on a change in pull request #821:
HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
smengcl commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408516113
##########
File path: hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeSetOwnerRequest.java
##########
@@ -147,18 +145,20 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager,
.setMessage(
"Volume '" + volume + "' owner is already '" + newOwner + "'.")
.setSuccess(false);
- return new OMVolumeSetOwnerResponse(omResponse.build());
+ omResponse.setSetVolumePropertyResponse(
+ SetVolumePropertyResponse.newBuilder().build());
+ omClientResponse = new OMVolumeSetOwnerResponse(omResponse.build());
+ addResponseToDoubleBuffer(transactionLogIndex, omClientResponse,
+ ozoneManagerDoubleBufferHelper);
+ return omClientResponse;
Review comment:
done
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org
[GitHub] [hadoop-ozone] smengcl commented on a change in pull request #821:
HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is
already the owner
Posted by GitBox <gi...@apache.org>.
smengcl commented on a change in pull request #821: HDDS-3374. Addendum: OMVolumeSetOwnerRequest doesn't check if user is already the owner
URL: https://github.com/apache/hadoop-ozone/pull/821#discussion_r408520487
##########
File path: hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerSetOwner.java
##########
@@ -0,0 +1,104 @@
+/**
+ * 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.om;
+
+import java.util.UUID;
+
+import org.apache.hadoop.hdds.conf.OzoneConfiguration;
+import org.apache.hadoop.ozone.MiniOzoneCluster;
+import org.apache.hadoop.ozone.client.ObjectStore;
+import org.apache.hadoop.ozone.client.OzoneClient;
+import org.apache.hadoop.ozone.client.protocol.ClientProtocol;
+
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_MAX_RETRIES_KEY;
+import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.IPC_CLIENT_CONNECT_RETRY_INTERVAL_KEY;
+import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_RATIS_PIPELINE_LIMIT;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_AUTHORIZER_CLASS_NATIVE;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_CLIENT_FAILOVER_MAX_ATTEMPTS_KEY;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_OPEN_KEY_EXPIRE_THRESHOLD_SECONDS;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.Timeout;
+
+/**
+ * Test OzoneManager setOwner command.
+ */
+public class TestOzoneManagerSetOwner {
+
+ @Rule
+ public Timeout timeout = new Timeout(120_000);
+
+ /**
Review comment:
done
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org