diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index 602fcd7..3b47cdd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ 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 diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/server/yarn_security_token.proto hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/server/yarn_security_token.proto deleted file mode 100644 index d1bef21..0000000 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/server/yarn_security_token.proto +++ /dev/null @@ -1,69 +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; -} - -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; -} - diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/yarn_security_token.proto hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/yarn_security_token.proto new file mode 100644 index 0000000..d1bef21 --- /dev/null +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/proto/yarn_security_token.proto @@ -0,0 +1,69 @@ +/** + * 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; +} + +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; +} + diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml index 983c4b8..9748374 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/pom.xml +++ 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 diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml index 49a0bdb..9d54184 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/pom.xml +++ 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 diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/TestProtos.java 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 +++ 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); + } +}