Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4E102200D1B for ; Thu, 28 Sep 2017 04:55:06 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 4C9C01609ED; Thu, 28 Sep 2017 02:55:06 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4508D1609EC for ; Thu, 28 Sep 2017 04:55:05 +0200 (CEST) Received: (qmail 83144 invoked by uid 500); 28 Sep 2017 02:54:57 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 76491 invoked by uid 99); 28 Sep 2017 02:54:53 -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; Thu, 28 Sep 2017 02:54:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D4049F5BD8; Thu, 28 Sep 2017 02:54:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jhung@apache.org To: common-commits@hadoop.apache.org Date: Thu, 28 Sep 2017 02:55:29 -0000 Message-Id: In-Reply-To: <5a1bb1528842409e971caee91a7793c5@git.apache.org> References: <5a1bb1528842409e971caee91a7793c5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [38/50] [abbrv] hadoop git commit: YARN-5953 addendum: Move QueueConfigInfo and SchedConfUpdateInfo to package org.apache.hadoop.yarn.webapp.dao archived-at: Thu, 28 Sep 2017 02:55:06 -0000 YARN-5953 addendum: Move QueueConfigInfo and SchedConfUpdateInfo to package org.apache.hadoop.yarn.webapp.dao Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a2109074 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a2109074 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a2109074 Branch: refs/heads/YARN-5734 Commit: a210907466e0b46c4224893db3c78b94521251c2 Parents: 36c474b Author: Xuan Authored: Mon Jul 31 11:49:05 2017 -0700 Committer: Jonathan Hung Committed: Wed Sep 27 19:52:58 2017 -0700 ---------------------------------------------------------------------- .../hadoop/yarn/webapp/dao/QueueConfigInfo.java | 57 +++++++++++++ .../yarn/webapp/dao/SchedConfUpdateInfo.java | 85 ++++++++++++++++++++ .../webapp/dao/QueueConfigInfo.java | 57 ------------- .../webapp/dao/SchedConfUpdateInfo.java | 85 -------------------- 4 files changed, 142 insertions(+), 142 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2109074/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/QueueConfigInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/QueueConfigInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/QueueConfigInfo.java new file mode 100644 index 0000000..d1d91c2 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/QueueConfigInfo.java @@ -0,0 +1,57 @@ +/** + * 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.webapp.dao; + +import java.util.HashMap; +import java.util.Map; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * Information for adding or updating a queue to scheduler configuration + * for this queue. + */ +@XmlRootElement +@XmlAccessorType(XmlAccessType.FIELD) +public class QueueConfigInfo { + + @XmlElement(name = "queueName") + private String queue; + + private HashMap params = new HashMap<>(); + + public QueueConfigInfo() { } + + public QueueConfigInfo(String queue, Map params) { + this.queue = queue; + this.params = new HashMap<>(params); + } + + public String getQueue() { + return this.queue; + } + + public HashMap getParams() { + return this.params; + } + +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2109074/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/SchedConfUpdateInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/SchedConfUpdateInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/SchedConfUpdateInfo.java new file mode 100644 index 0000000..bb84096 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/dao/SchedConfUpdateInfo.java @@ -0,0 +1,85 @@ +/** + * 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.webapp.dao; + +import java.util.ArrayList; +import java.util.HashMap; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * Information for making scheduler configuration changes (supports adding, + * removing, or updating a queue, as well as global scheduler conf changes). + */ +@XmlRootElement(name = "schedConf") +@XmlAccessorType(XmlAccessType.FIELD) +public class SchedConfUpdateInfo { + + @XmlElement(name = "add-queue") + private ArrayList addQueueInfo = new ArrayList<>(); + + @XmlElement(name = "remove-queue") + private ArrayList removeQueueInfo = new ArrayList<>(); + + @XmlElement(name = "update-queue") + private ArrayList updateQueueInfo = new ArrayList<>(); + + private HashMap global = new HashMap<>(); + + public SchedConfUpdateInfo() { + // JAXB needs this + } + + public ArrayList getAddQueueInfo() { + return addQueueInfo; + } + + public void setAddQueueInfo(ArrayList addQueueInfo) { + this.addQueueInfo = addQueueInfo; + } + + public ArrayList getRemoveQueueInfo() { + return removeQueueInfo; + } + + public void setRemoveQueueInfo(ArrayList removeQueueInfo) { + this.removeQueueInfo = removeQueueInfo; + } + + public ArrayList getUpdateQueueInfo() { + return updateQueueInfo; + } + + public void setUpdateQueueInfo(ArrayList updateQueueInfo) { + this.updateQueueInfo = updateQueueInfo; + } + + @XmlElementWrapper(name = "global-updates") + public HashMap getGlobalParams() { + return global; + } + + public void setGlobalParams(HashMap globalInfo) { + this.global = globalInfo; + } +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2109074/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/QueueConfigInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/QueueConfigInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/QueueConfigInfo.java deleted file mode 100644 index d1d91c2..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/QueueConfigInfo.java +++ /dev/null @@ -1,57 +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. - */ - -package org.apache.hadoop.yarn.webapp.dao; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * Information for adding or updating a queue to scheduler configuration - * for this queue. - */ -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) -public class QueueConfigInfo { - - @XmlElement(name = "queueName") - private String queue; - - private HashMap params = new HashMap<>(); - - public QueueConfigInfo() { } - - public QueueConfigInfo(String queue, Map params) { - this.queue = queue; - this.params = new HashMap<>(params); - } - - public String getQueue() { - return this.queue; - } - - public HashMap getParams() { - return this.params; - } - -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/a2109074/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/SchedConfUpdateInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/SchedConfUpdateInfo.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/SchedConfUpdateInfo.java deleted file mode 100644 index bb84096..0000000 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/dao/SchedConfUpdateInfo.java +++ /dev/null @@ -1,85 +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. - */ - -package org.apache.hadoop.yarn.webapp.dao; - -import java.util.ArrayList; -import java.util.HashMap; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementWrapper; -import javax.xml.bind.annotation.XmlRootElement; - -/** - * Information for making scheduler configuration changes (supports adding, - * removing, or updating a queue, as well as global scheduler conf changes). - */ -@XmlRootElement(name = "schedConf") -@XmlAccessorType(XmlAccessType.FIELD) -public class SchedConfUpdateInfo { - - @XmlElement(name = "add-queue") - private ArrayList addQueueInfo = new ArrayList<>(); - - @XmlElement(name = "remove-queue") - private ArrayList removeQueueInfo = new ArrayList<>(); - - @XmlElement(name = "update-queue") - private ArrayList updateQueueInfo = new ArrayList<>(); - - private HashMap global = new HashMap<>(); - - public SchedConfUpdateInfo() { - // JAXB needs this - } - - public ArrayList getAddQueueInfo() { - return addQueueInfo; - } - - public void setAddQueueInfo(ArrayList addQueueInfo) { - this.addQueueInfo = addQueueInfo; - } - - public ArrayList getRemoveQueueInfo() { - return removeQueueInfo; - } - - public void setRemoveQueueInfo(ArrayList removeQueueInfo) { - this.removeQueueInfo = removeQueueInfo; - } - - public ArrayList getUpdateQueueInfo() { - return updateQueueInfo; - } - - public void setUpdateQueueInfo(ArrayList updateQueueInfo) { - this.updateQueueInfo = updateQueueInfo; - } - - @XmlElementWrapper(name = "global-updates") - public HashMap getGlobalParams() { - return global; - } - - public void setGlobalParams(HashMap globalInfo) { - this.global = globalInfo; - } -} --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org