Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5BB2B18C82 for ; Tue, 28 Jul 2015 20:54:50 +0000 (UTC) Received: (qmail 4753 invoked by uid 500); 28 Jul 2015 20:54:42 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 3037 invoked by uid 500); 28 Jul 2015 20:54:41 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 1838 invoked by uid 99); 28 Jul 2015 20:54:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Jul 2015 20:54:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E4AD4E35DB; Tue, 28 Jul 2015 20:54:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jianhe@apache.org To: common-commits@hadoop.apache.org Date: Tue, 28 Jul 2015 20:54:50 -0000 Message-Id: In-Reply-To: <4eb68505d8af46ee95799008758b125f@git.apache.org> References: <4eb68505d8af46ee95799008758b125f@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [11/50] [abbrv] hadoop git commit: YARN-3900. Protobuf layout of yarn_security_token causes errors in other protos that include it (adhoot via rkanter) YARN-3900. Protobuf layout of yarn_security_token causes errors in other protos that include it (adhoot via rkanter) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1d3026e7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1d3026e7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1d3026e7 Branch: refs/heads/YARN-1197 Commit: 1d3026e7b3cf2f3a8a544b66ff14783cc590bdac Parents: 6736a1a Author: Robert Kanter Authored: Thu Jul 23 14:42:49 2015 -0700 Committer: Robert Kanter Committed: Thu Jul 23 14:46:54 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 + .../hadoop-yarn/hadoop-yarn-common/pom.xml | 2 +- .../main/proto/server/yarn_security_token.proto | 70 -------------------- .../src/main/proto/yarn_security_token.proto | 70 ++++++++++++++++++++ .../pom.xml | 2 +- .../hadoop-yarn-server-resourcemanager/pom.xml | 2 +- .../resourcemanager/recovery/TestProtos.java | 36 ++++++++++ 7 files changed, 112 insertions(+), 73 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3026e7/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9416cd6..3d41ba7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -666,6 +666,9 @@ Release 2.8.0 - UNRELEASED YARN-3941. Proportional Preemption policy should try to avoid sending duplicate PREEMPT_CONTAINER event to scheduler. (Sunil G via wangda) + YARN-3900. Protobuf layout of yarn_security_token causes errors in other protos + that include it (adhoot via rkanter) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3026e7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 602fcd7..3b47cdd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -253,7 +253,7 @@ ${basedir}/src/main/proto - ${basedir}/src/main/proto/server + ${basedir}/src/main/proto yarn_security_token.proto http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3026e7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/server/yarn_security_token.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/server/yarn_security_token.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/server/yarn_security_token.proto deleted file mode 100644 index 339e99e..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/server/yarn_security_token.proto +++ /dev/null @@ -1,70 +0,0 @@ -/** - * 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 - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * 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. - */ - -option java_package = "org.apache.hadoop.yarn.proto"; -option java_outer_classname = "YarnSecurityTokenProtos"; -option java_generic_services = true; -option java_generate_equals_and_hash = true; -package hadoop.yarn; - -import "yarn_protos.proto"; - -// None of the following records are supposed to be exposed to users. - -message NMTokenIdentifierProto { - optional ApplicationAttemptIdProto appAttemptId = 1; - optional NodeIdProto nodeId = 2; - optional string appSubmitter = 3; - optional int32 keyId = 4 [default = -1]; -} - -message AMRMTokenIdentifierProto { - optional ApplicationAttemptIdProto appAttemptId = 1; - optional int32 keyId = 2 [default = -1]; -} - -message ContainerTokenIdentifierProto { - optional ContainerIdProto containerId = 1; - optional string nmHostAddr = 2; - optional string appSubmitter = 3; - optional ResourceProto resource = 4; - optional int64 expiryTimeStamp =5; - optional int32 masterKeyId = 6 [default = -1]; - optional int64 rmIdentifier = 7; - optional PriorityProto priority = 8; - optional int64 creationTime = 9; - optional LogAggregationContextProto logAggregationContext = 10; - optional string nodeLabelExpression = 11; - optional ContainerTypeProto containerType = 12; -} - -message ClientToAMTokenIdentifierProto { - optional ApplicationAttemptIdProto appAttemptId = 1; - optional string clientName = 2; -} - -message YARNDelegationTokenIdentifierProto { - optional string owner = 1; - optional string renewer = 2; - optional string realUser = 3; - optional int64 issueDate = 4; - optional int64 maxDate = 5; - optional int32 sequenceNumber = 6; - optional int32 masterKeyId = 7; -} - http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3026e7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/yarn_security_token.proto ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/yarn_security_token.proto b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/yarn_security_token.proto new file mode 100644 index 0000000..339e99e --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/yarn_security_token.proto @@ -0,0 +1,70 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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. + */ + +option java_package = "org.apache.hadoop.yarn.proto"; +option java_outer_classname = "YarnSecurityTokenProtos"; +option java_generic_services = true; +option java_generate_equals_and_hash = true; +package hadoop.yarn; + +import "yarn_protos.proto"; + +// None of the following records are supposed to be exposed to users. + +message NMTokenIdentifierProto { + optional ApplicationAttemptIdProto appAttemptId = 1; + optional NodeIdProto nodeId = 2; + optional string appSubmitter = 3; + optional int32 keyId = 4 [default = -1]; +} + +message AMRMTokenIdentifierProto { + optional ApplicationAttemptIdProto appAttemptId = 1; + optional int32 keyId = 2 [default = -1]; +} + +message ContainerTokenIdentifierProto { + optional ContainerIdProto containerId = 1; + optional string nmHostAddr = 2; + optional string appSubmitter = 3; + optional ResourceProto resource = 4; + optional int64 expiryTimeStamp =5; + optional int32 masterKeyId = 6 [default = -1]; + optional int64 rmIdentifier = 7; + optional PriorityProto priority = 8; + optional int64 creationTime = 9; + optional LogAggregationContextProto logAggregationContext = 10; + optional string nodeLabelExpression = 11; + optional ContainerTypeProto containerType = 12; +} + +message ClientToAMTokenIdentifierProto { + optional ApplicationAttemptIdProto appAttemptId = 1; + optional string clientName = 2; +} + +message YARNDelegationTokenIdentifierProto { + optional string owner = 1; + optional string renewer = 2; + optional string realUser = 3; + optional int64 issueDate = 4; + optional int64 maxDate = 5; + optional int32 sequenceNumber = 6; + optional int32 masterKeyId = 7; +} + http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3026e7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml index 983c4b8..9748374 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml @@ -205,7 +205,7 @@ ${basedir}/../../../../hadoop-common-project/hadoop-common/src/main/proto ${basedir}/../../hadoop-yarn-api/src/main/proto - ${basedir}/../../hadoop-yarn-common/src/main/proto/server/ + ${basedir}/../../hadoop-yarn-common/src/main/proto ${basedir}/../hadoop-yarn-server-common/src/main/proto ${basedir}/src/main/proto http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3026e7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 49a0bdb..9d54184 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml @@ -283,7 +283,7 @@ ${basedir}/../../../../hadoop-common-project/hadoop-common/src/main/proto ${basedir}/../../hadoop-yarn-api/src/main/proto - ${basedir}/../../hadoop-yarn-common/src/main/proto/server/ + ${basedir}/../../hadoop-yarn-common/src/main/proto ${basedir}/../hadoop-yarn-server-common/src/main/proto ${basedir}/src/main/proto http://git-wip-us.apache.org/repos/asf/hadoop/blob/1d3026e7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestProtos.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestProtos.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestProtos.java new file mode 100644 index 0000000..cc96412 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestProtos.java @@ -0,0 +1,36 @@ +/** + * 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * 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.yarn.server.resourcemanager.recovery; + +import org.apache.hadoop.yarn.proto.YarnServerResourceManagerRecoveryProtos.EpochProto; +import org.junit.Assert; +import org.junit.Test; + +/** + * Simple test to verify the protos generated are valid + */ +public class TestProtos { + + @Test + public void testProtoCanBePrinted() throws Exception { + EpochProto proto = EpochProto.newBuilder().setEpoch(100).build(); + String protoString = proto.toString(); + Assert.assertNotNull(protoString); + } +}