YARN-4081. Add support for multiple resource types in the Resource class. (Varun Vasudev via wangda)
(cherry picked from commit 1bbab7c1570a2438b2fa6da70397dd1d5211a137) Conflicts: hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/api/records/impl/pb/ResourcePBImpl.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/util/resource/Resources.java Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/089fe09f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/089fe09f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/089fe09f Branch: refs/heads/YARN-8200 Commit: 089fe09f75baa85cbd53925d29e2be3c8f422771 Parents: 58bcb90 Author: Wangda Tan <wan...@apache.org> Authored: Thu Sep 10 09:43:26 2015 -0700 Committer: Konstantin V Shvachko <kshvac...@linkedin.com> Committed: Wed May 2 13:19:57 2018 -0700 ---------------------------------------------------------------------- .../src/main/resources/META-INF/LICENSE.txt | 1661 ++++++++++++++++++ .../src/main/resources/META-INF/NOTICE.txt | 283 +++ .../yarn/api/protocolrecords/ResourceTypes.java | 27 + .../hadoop/yarn/api/records/Resource.java | 205 ++- .../yarn/api/records/ResourceInformation.java | 218 +++ .../exceptions/ResourceNotFoundException.java | 45 + .../hadoop/yarn/util/UnitsConversionUtil.java | 197 +++ .../src/main/proto/yarn_protos.proto | 12 + .../yarn/conf/TestResourceInformation.java | 70 + .../yarn/util/TestUnitsConversionUtil.java | 120 ++ .../yarn/api/records/impl/pb/ProtoUtils.java | 13 + .../api/records/impl/pb/ResourcePBImpl.java | 193 +- .../hadoop/yarn/util/resource/Resources.java | 139 +- .../hadoop/yarn/api/TestPBImplRecords.java | 4 + 14 files changed, 3105 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org