[hadoop] branch trunk updated: MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 3f4f097 MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph 3f4f097 is described below commit 3f4f097f1f29249c8ad5d59ccefcddf0a66b2e6b Author: Szilard Nemeth AuthorDate: Thu Aug 15 17:07:43 2019 +0200 MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph --- .../java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java index 287c646..8cce1c3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java @@ -233,8 +233,8 @@ public class TestHSWebApp { PrintWriter spyPw = WebAppTests.getPrintWriter(injector); verify(spyPw).write( "Logs not available for container_10_0001_01_01." -+ " Aggregation may not be complete, " -+ "Check back later or try the nodemanager at " ++ " Aggregation may not be complete, Check back later or try to" ++ " find the container logs in the local directory of nodemanager " + MockJobs.NM_HOST + ":" + MockJobs.NM_PORT); } - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch branch-3.2 updated: MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/branch-3.2 by this push: new faafab9 MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph faafab9 is described below commit faafab93885a7b02a9db86719912afa461bb5791 Author: Szilard Nemeth AuthorDate: Thu Aug 15 17:07:43 2019 +0200 MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph (cherry picked from commit 3f4f097f1f29249c8ad5d59ccefcddf0a66b2e6b) --- .../java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java index 287c646..8cce1c3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java @@ -233,8 +233,8 @@ public class TestHSWebApp { PrintWriter spyPw = WebAppTests.getPrintWriter(injector); verify(spyPw).write( "Logs not available for container_10_0001_01_01." -+ " Aggregation may not be complete, " -+ "Check back later or try the nodemanager at " ++ " Aggregation may not be complete, Check back later or try to" ++ " find the container logs in the local directory of nodemanager " + MockJobs.NM_HOST + ":" + MockJobs.NM_PORT); } - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch branch-3.1 updated: MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch branch-3.1 in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/branch-3.1 by this push: new a3fb032 MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph a3fb032 is described below commit a3fb0320101c2c98bf45e4057cab0f1ae19980de Author: Szilard Nemeth AuthorDate: Thu Aug 15 17:07:43 2019 +0200 MAPREDUCE-7230. TestHSWebApp.testLogsViewSingle fails. Contributed by Prabhu Joseph (cherry picked from commit 3f4f097f1f29249c8ad5d59ccefcddf0a66b2e6b) --- .../java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java index 287c646..8cce1c3 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHSWebApp.java @@ -233,8 +233,8 @@ public class TestHSWebApp { PrintWriter spyPw = WebAppTests.getPrintWriter(injector); verify(spyPw).write( "Logs not available for container_10_0001_01_01." -+ " Aggregation may not be complete, " -+ "Check back later or try the nodemanager at " ++ " Aggregation may not be complete, Check back later or try to" ++ " find the container logs in the local directory of nodemanager " + MockJobs.NM_HOST + ":" + MockJobs.NM_PORT); } - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch trunk updated: YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 1845a83 YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph 1845a83 is described below commit 1845a83cec6563482523d8c34b38c4e36c0aa9df Author: Szilard Nemeth AuthorDate: Thu Aug 15 17:15:38 2019 +0200 YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph --- .../apache/hadoop/yarn/server/resourcemanager/ClientRMService.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index 298bea7..1e54cd6 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -156,6 +156,7 @@ import org.apache.hadoop.yarn.exceptions.ApplicationAttemptNotFoundException; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.ContainerNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.RPCUtil; @@ -283,7 +284,8 @@ public class ClientRMService extends AbstractService implements this.server.addTerseExceptions(ApplicationNotFoundException.class, ApplicationAttemptNotFoundException.class, -ContainerNotFoundException.class); +ContainerNotFoundException.class, +YARNFeatureNotEnabledException.class); // Enable service authorization? if (conf.getBoolean( - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch branch-3.2 updated: YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/branch-3.2 by this push: new e616037 YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph e616037 is described below commit e616037d1fe86449f33425c636905d96fff8e2a1 Author: Szilard Nemeth AuthorDate: Thu Aug 15 17:15:38 2019 +0200 YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph (cherry picked from commit 1845a83cec6563482523d8c34b38c4e36c0aa9df) --- .../apache/hadoop/yarn/server/resourcemanager/ClientRMService.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index e2765a3..6cc7b43 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -156,6 +156,7 @@ import org.apache.hadoop.yarn.exceptions.ApplicationAttemptNotFoundException; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.ContainerNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.RPCUtil; @@ -282,7 +283,8 @@ public class ClientRMService extends AbstractService implements this.server.addTerseExceptions(ApplicationNotFoundException.class, ApplicationAttemptNotFoundException.class, -ContainerNotFoundException.class); +ContainerNotFoundException.class, +YARNFeatureNotEnabledException.class); // Enable service authorization? if (conf.getBoolean( - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch branch-3.1 updated: YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch branch-3.1 in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/branch-3.1 by this push: new 9411437 YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph 9411437 is described below commit 94114378ce919f68dca5b49c14da350975dde828 Author: Szilard Nemeth AuthorDate: Thu Aug 15 17:15:38 2019 +0200 YARN-9488. Skip YARNFeatureNotEnabledException from ClientRMService. Contributed by Prabhu Joseph (cherry picked from commit 1845a83cec6563482523d8c34b38c4e36c0aa9df) --- .../apache/hadoop/yarn/server/resourcemanager/ClientRMService.java| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java index 379251e..e0dead9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ClientRMService.java @@ -144,6 +144,7 @@ import org.apache.hadoop.yarn.exceptions.ApplicationAttemptNotFoundException; import org.apache.hadoop.yarn.exceptions.ApplicationNotFoundException; import org.apache.hadoop.yarn.exceptions.ContainerNotFoundException; import org.apache.hadoop.yarn.exceptions.YarnException; +import org.apache.hadoop.yarn.exceptions.YARNFeatureNotEnabledException; import org.apache.hadoop.yarn.factories.RecordFactory; import org.apache.hadoop.yarn.factory.providers.RecordFactoryProvider; import org.apache.hadoop.yarn.ipc.RPCUtil; @@ -268,7 +269,8 @@ public class ClientRMService extends AbstractService implements this.server.addTerseExceptions(ApplicationNotFoundException.class, ApplicationAttemptNotFoundException.class, -ContainerNotFoundException.class); +ContainerNotFoundException.class, +YARNFeatureNotEnabledException.class); // Enable service authorization? if (conf.getBoolean( - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch trunk updated: YARN-9679. Regular code cleanup in TestResourcePluginManager (#1122)
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 22c4f38 YARN-9679. Regular code cleanup in TestResourcePluginManager (#1122) 22c4f38 is described below commit 22c4f38c4b005a70c9b95d8aaa350763aaec5c5e Author: Adam Antal AuthorDate: Thu Aug 15 17:32:05 2019 +0200 YARN-9679. Regular code cleanup in TestResourcePluginManager (#1122) --- .../resourceplugin/TestResourcePluginManager.java | 86 +++--- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/TestResourcePluginManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/TestResourcePluginManager.java index a41edba..28f917f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/TestResourcePluginManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/resourceplugin/TestResourcePluginManager.java @@ -48,7 +48,6 @@ import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; import org.apache.hadoop.yarn.util.resource.ResourceUtils; import org.apache.hadoop.yarn.util.resource.TestResourceUtils; import org.junit.After; -import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -57,6 +56,8 @@ import java.util.List; import java.util.Map; import java.io.File; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyMap; import static org.mockito.Mockito.mock; @@ -67,14 +68,10 @@ import static org.mockito.Mockito.spy; public class TestResourcePluginManager extends NodeManagerTestBase { private NodeManager nm; - - private YarnConfiguration conf; - private String tempResourceTypesFile; @Before public void setup() throws Exception { -this.conf = createNMConfig(); // setup resource-types.xml ResourceUtils.resetResourceTypes(); String resourceTypesFile = "resource-types-pluggable-devices.xml"; @@ -82,7 +79,7 @@ public class TestResourcePluginManager extends NodeManagerTestBase { TestResourceUtils.setupResourceTypes(this.conf, resourceTypesFile); } - ResourcePluginManager stubResourcePluginmanager() { + private ResourcePluginManager stubResourcePluginmanager() { // Stub ResourcePluginManager final ResourcePluginManager rpm = mock(ResourcePluginManager.class); Map plugins = new HashMap<>(); @@ -117,7 +114,7 @@ public class TestResourcePluginManager extends NodeManagerTestBase { // cleanup resource-types.xml File dest = new File(this.tempResourceTypesFile); if (dest.exists()) { - dest.delete(); + assertThat(dest.delete()).isTrue(); } } @@ -155,10 +152,10 @@ public class TestResourcePluginManager extends NodeManagerTestBase { } } - private class MyMockNM extends NodeManager { + private class ResourcePluginMockNM extends NodeManager { private final ResourcePluginManager rpm; -public MyMockNM(ResourcePluginManager rpm) { +ResourcePluginMockNM(ResourcePluginManager rpm) { this.rpm = rpm; } @@ -196,28 +193,28 @@ public class TestResourcePluginManager extends NodeManagerTestBase { } } - /* - * Make sure ResourcePluginManager is initialized during NM start up. + /** + * Make sure {@link ResourcePluginManager} is initialized during NM start up. */ @Test(timeout = 3) public void testResourcePluginManagerInitialization() throws Exception { final ResourcePluginManager rpm = stubResourcePluginmanager(); -nm = new MyMockNM(rpm); +nm = new ResourcePluginMockNM(rpm); nm.init(conf); verify(rpm).initialize( any(Context.class)); } - /* - * Make sure ResourcePluginManager is invoked during NM update. + /** + * Make sure {@link ResourcePluginManager} is invoked during NM update. */ @Test(timeout = 3) public void testNodeStatusUpdaterWithResourcePluginsEnabled() throws Exception { final ResourcePluginManager rpm = stubResourcePluginmanager(); -nm = new MyMockNM(rpm); +nm = new ResourcePluginMockNM(rpm); nm.init(conf); nm.start(); @@ -230,8 +227,8 @@ public class TestResourcePluginManager extends NodeManagerTestBase { .updateConfiguredResource(any(Resource.class)); }
[hadoop] branch trunk updated: HDDS-1768. Audit xxxAcl methods in OzoneManager (#1204)
This is an automated email from the ASF dual-hosted git repository. bharat pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new c801f7a HDDS-1768. Audit xxxAcl methods in OzoneManager (#1204) c801f7a is described below commit c801f7a26c08d367e902d3b18000853ad7ba2c82 Author: dineshchitlangia AuthorDate: Thu Aug 15 11:43:47 2019 -0400 HDDS-1768. Audit xxxAcl methods in OzoneManager (#1204) --- .../java/org/apache/hadoop/ozone/OzoneConsts.java | 2 + .../org/apache/hadoop/ozone/audit/OMAction.java| 6 + .../apache/hadoop/ozone/security/acl/OzoneObj.java | 13 + .../rpc/TestOzoneRpcClientForAclAuditLog.java | 284 + .../src/test/resources/log4j2.properties | 76 ++ .../org/apache/hadoop/ozone/om/OzoneManager.java | 197 +- 6 files changed, 510 insertions(+), 68 deletions(-) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java index 67bd22d..d9b33d8 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java @@ -248,6 +248,7 @@ public final class OzoneConsts { public static final String MAX_KEYS = "maxKeys"; public static final String PREFIX = "prefix"; public static final String KEY_PREFIX = "keyPrefix"; + public static final String ACL = "acl"; public static final String ACLS = "acls"; public static final String USER_ACL = "userAcl"; public static final String ADD_ACLS = "addAcls"; @@ -255,6 +256,7 @@ public final class OzoneConsts { public static final String MAX_NUM_OF_BUCKETS = "maxNumOfBuckets"; public static final String TO_KEY_NAME = "toKeyName"; public static final String STORAGE_TYPE = "storageType"; + public static final String RESOURCE_TYPE = "resourceType"; public static final String IS_VERSION_ENABLED = "isVersionEnabled"; public static final String CREATION_TIME = "creationTime"; public static final String DATA_SIZE = "dataSize"; diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/audit/OMAction.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/audit/OMAction.java index e72beff..ebcd439 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/audit/OMAction.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/audit/OMAction.java @@ -58,6 +58,12 @@ public enum OMAction implements AuditAction { LIST_MULTIPART_UPLOAD_PARTS, ABORT_MULTIPART_UPLOAD, + //ACL Actions + ADD_ACL, + GET_ACL, + SET_ACL, + REMOVE_ACL, + //FS Actions GET_FILE_STATUS, CREATE_DIRECTORY, diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObj.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObj.java index 6e9ac25..4a95e55 100644 --- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObj.java +++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObj.java @@ -22,6 +22,8 @@ import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos; import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OzoneObj.ObjectType; +import java.util.LinkedHashMap; +import java.util.Map; import static org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OzoneObj.StoreType.*; /** @@ -131,4 +133,15 @@ public abstract class OzoneObj implements IOzoneObj { value = objType; } } + + public Map toAuditMap() { +Map auditMap = new LinkedHashMap<>(); +auditMap.put(OzoneConsts.RESOURCE_TYPE, this.getResourceType().value); +auditMap.put(OzoneConsts.STORAGE_TYPE, this.getStoreType().value); +auditMap.put(OzoneConsts.VOLUME, this.getVolumeName()); +auditMap.put(OzoneConsts.BUCKET, this.getBucketName()); +auditMap.put(OzoneConsts.KEY, this.getKeyName()); +return auditMap; + } + } diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java new file mode 100644 index 000..9320fec --- /dev/null +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneRpcClientForAclAuditLog.java @@ -0,0 +1,284 @@ +package org.apache.hadoop.ozone.client.rpc; + +import net.jcip.annotations.NotThreadSafe; +import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.scm.protocolPB.StorageContainerLocationProtocolClientSideTranslatorPB; +import or
[hadoop] branch trunk updated: HDDS-1954. StackOverflowError in OzoneClientInvocationHandler
This is an automated email from the ASF dual-hosted git repository. aengineer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 46d6191 HDDS-1954. StackOverflowError in OzoneClientInvocationHandler 46d6191 is described below commit 46d61913ff2a4ed6b5c77f348ba71c2c677b61ef Author: Doroszlai, Attila AuthorDate: Mon Aug 12 21:43:00 2019 +0200 HDDS-1954. StackOverflowError in OzoneClientInvocationHandler Signed-off-by: Anu Engineer --- .../org/apache/hadoop/ozone/client/OzoneClientInvocationHandler.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientInvocationHandler.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientInvocationHandler.java index 3051e2d..cdc7702 100644 --- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientInvocationHandler.java +++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientInvocationHandler.java @@ -48,7 +48,7 @@ public class OzoneClientInvocationHandler implements InvocationHandler { @Override public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { -LOG.trace("Invoking method {} on proxy {}", method, proxy); +LOG.trace("Invoking method {} on target {}", method, target); try { long startTime = Time.monotonicNow(); Object result = method.invoke(target, args); - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch trunk updated: HDDS-1910. Cannot build hadoop-hdds-config from scratch in IDEA
This is an automated email from the ASF dual-hosted git repository. aengineer pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 77d102c HDDS-1910. Cannot build hadoop-hdds-config from scratch in IDEA 77d102c is described below commit 77d102ceba1aad2ae3e9172cdef35c6a42735ae2 Author: Doroszlai, Attila AuthorDate: Mon Aug 5 16:13:05 2019 +0200 HDDS-1910. Cannot build hadoop-hdds-config from scratch in IDEA Signed-off-by: Anu Engineer --- .../services/javax.annotation.processing.Processor | 0 hadoop-hdds/config/pom.xml | 21 - .../services/javax.annotation.processing.Processor | 0 3 files changed, 21 deletions(-) diff --git a/hadoop-hdds/config/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/hadoop-hdds/common/src/main/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% copy from hadoop-hdds/config/src/main/resources/META-INF/services/javax.annotation.processing.Processor copy to hadoop-hdds/common/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/hadoop-hdds/config/pom.xml b/hadoop-hdds/config/pom.xml index bf62949..a595549 100644 --- a/hadoop-hdds/config/pom.xml +++ b/hadoop-hdds/config/pom.xml @@ -42,25 +42,4 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd";> - - - -maven-compiler-plugin -3.1 - - - default-compile - compile - -compile - - - --proc:none - - - - - - diff --git a/hadoop-hdds/config/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/hadoop-hdds/config/src/test/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from hadoop-hdds/config/src/main/resources/META-INF/services/javax.annotation.processing.Processor rename to hadoop-hdds/config/src/test/resources/META-INF/services/javax.annotation.processing.Processor - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch trunk updated: HADOOP-16504. Increase ipc.server.listen.queue.size default from 128 to 256. Contributed by Lisheng Sun.
This is an automated email from the ASF dual-hosted git repository. weichiu pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 5882cf9 HADOOP-16504. Increase ipc.server.listen.queue.size default from 128 to 256. Contributed by Lisheng Sun. 5882cf9 is described below commit 5882cf94ea5094626eb86ff7ac7f8cd32aacb139 Author: Wei-Chiu Chuang AuthorDate: Thu Aug 15 15:20:54 2019 -0700 HADOOP-16504. Increase ipc.server.listen.queue.size default from 128 to 256. Contributed by Lisheng Sun. --- .../main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java | 2 +- hadoop-common-project/hadoop-common/src/main/resources/core-default.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java index b24ce9e..a68012b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/CommonConfigurationKeysPublic.java @@ -417,7 +417,7 @@ public class CommonConfigurationKeysPublic { public static final String IPC_SERVER_LISTEN_QUEUE_SIZE_KEY = "ipc.server.listen.queue.size"; /** Default value for IPC_SERVER_LISTEN_QUEUE_SIZE_KEY */ - public static final int IPC_SERVER_LISTEN_QUEUE_SIZE_DEFAULT = 128; + public static final int IPC_SERVER_LISTEN_QUEUE_SIZE_DEFAULT = 256; /** * @see * diff --git a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml index 194a0cd..05bba0e 100644 --- a/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml +++ b/hadoop-common-project/hadoop-common/src/main/resources/core-default.xml @@ -2196,7 +2196,7 @@ ipc.server.listen.queue.size - 128 + 256 Indicates the length of the listen queue for servers accepting client connections. - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch trunk updated: HDDS-1894. Add filter to scmcli listPipelines. (#1286)
This is an automated email from the ASF dual-hosted git repository. sammichen pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new bf37515 HDDS-1894. Add filter to scmcli listPipelines. (#1286) bf37515 is described below commit bf3751521b51f8de25c12d6366e3fc535106cbb3 Author: Li Cheng AuthorDate: Fri Aug 16 14:33:04 2019 +0800 HDDS-1894. Add filter to scmcli listPipelines. (#1286) --- .../scm/cli/pipeline/ListPipelinesSubcommand.java | 24 +- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java index 0f8cf28..1489ed0 100644 --- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java +++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/pipeline/ListPipelinesSubcommand.java @@ -38,11 +38,33 @@ public class ListPipelinesSubcommand implements Callable { @CommandLine.ParentCommand private SCMCLI parent; + @CommandLine.Option( names = {"-ffc", "--filterByFactor"}, + description = "Filter listed pipelines by Factor(ONE/one)", defaultValue = "", + required = false) + private String factor; + + @CommandLine.Option( names = {"-fst", "--filterByState"}, + description = "Filter listed pipelines by State(OPEN/CLOSE)", defaultValue = "", + required = false) + private String state; + + @Override public Void call() throws Exception { try (ScmClient scmClient = parent.createScmClient()) { - scmClient.listPipelines().forEach(System.out::println); + if (isNullOrEmpty(factor) && isNullOrEmpty(state)) { +scmClient.listPipelines().forEach(System.out::println); + } else { +scmClient.listPipelines().stream() +.filter(p -> ((isNullOrEmpty(factor) || (p.getFactor().toString().compareToIgnoreCase(factor) == 0)) +&& (isNullOrEmpty(state) || (p.getPipelineState().toString().compareToIgnoreCase(state) == 0 +.forEach(System.out::println); + } return null; } } + + protected static boolean isNullOrEmpty(String str) { +return ((str == null) || str.trim().isEmpty()); + } } \ No newline at end of file - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch trunk updated: YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/trunk by this push: new 2a05e0f YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal 2a05e0f is described below commit 2a05e0ff3b5ab3be8654e9e96c6556865ef26096 Author: Szilard Nemeth AuthorDate: Fri Aug 16 08:52:09 2019 +0200 YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal --- .../containermanager/logaggregation/AppLogAggregatorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index 77bec72..245dc10 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -395,7 +395,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator { if (logAggregationSucceedInThisCycle && deletionTask != null) { delService.delete(deletionTask); } - if (!diagnosticMessage.isEmpty()) { + if (diagnosticMessage != null && !diagnosticMessage.isEmpty()) { LOG.debug("Sending log aggregation report along with the " + "following diagnostic message:\"{}\"", diagnosticMessage); } - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[hadoop] branch branch-3.2 updated: YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal
This is an automated email from the ASF dual-hosted git repository. snemeth pushed a commit to branch branch-3.2 in repository https://gitbox.apache.org/repos/asf/hadoop.git The following commit(s) were added to refs/heads/branch-3.2 by this push: new 8fee380 YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal 8fee380 is described below commit 8fee3808c5aa89cb96b4ef60a71ca6a2ce9055ad Author: Szilard Nemeth AuthorDate: Fri Aug 16 08:52:09 2019 +0200 YARN-9749. TestAppLogAggregatorImpl#testDFSQuotaExceeded fails on trunk. Contributed by Adam Antal (cherry picked from commit 2a05e0ff3b5ab3be8654e9e96c6556865ef26096) --- .../containermanager/logaggregation/AppLogAggregatorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index 965734f..94a9700 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -395,7 +395,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator { if (logAggregationSucceedInThisCycle && deletionTask != null) { delService.delete(deletionTask); } - if (!diagnosticMessage.isEmpty()) { + if (diagnosticMessage != null && !diagnosticMessage.isEmpty()) { LOG.debug("Sending log aggregation report along with the " + "following diagnostic message:\"{}\"", diagnosticMessage); } - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org