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/09b7c876 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09b7c876 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09b7c876 Branch: refs/heads/branch-3.0 Commit: 09b7c8766eaf68235bc75b268e6d38ce777d5b0d Parents: e09f0d6 Author: Xuan <xg...@apache.org> Authored: Mon Jul 31 11:49:05 2017 -0700 Committer: Jonathan Hung <jh...@linkedin.com> Committed: Mon Oct 9 14:54:54 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/09b7c876/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<String, String> params = new HashMap<>(); + + public QueueConfigInfo() { } + + public QueueConfigInfo(String queue, Map<String, String> params) { + this.queue = queue; + this.params = new HashMap<>(params); + } + + public String getQueue() { + return this.queue; + } + + public HashMap<String, String> getParams() { + return this.params; + } + +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/09b7c876/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<QueueConfigInfo> addQueueInfo = new ArrayList<>(); + + @XmlElement(name = "remove-queue") + private ArrayList<String> removeQueueInfo = new ArrayList<>(); + + @XmlElement(name = "update-queue") + private ArrayList<QueueConfigInfo> updateQueueInfo = new ArrayList<>(); + + private HashMap<String, String> global = new HashMap<>(); + + public SchedConfUpdateInfo() { + // JAXB needs this + } + + public ArrayList<QueueConfigInfo> getAddQueueInfo() { + return addQueueInfo; + } + + public void setAddQueueInfo(ArrayList<QueueConfigInfo> addQueueInfo) { + this.addQueueInfo = addQueueInfo; + } + + public ArrayList<String> getRemoveQueueInfo() { + return removeQueueInfo; + } + + public void setRemoveQueueInfo(ArrayList<String> removeQueueInfo) { + this.removeQueueInfo = removeQueueInfo; + } + + public ArrayList<QueueConfigInfo> getUpdateQueueInfo() { + return updateQueueInfo; + } + + public void setUpdateQueueInfo(ArrayList<QueueConfigInfo> updateQueueInfo) { + this.updateQueueInfo = updateQueueInfo; + } + + @XmlElementWrapper(name = "global-updates") + public HashMap<String, String> getGlobalParams() { + return global; + } + + public void setGlobalParams(HashMap<String, String> globalInfo) { + this.global = globalInfo; + } +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/09b7c876/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<String, String> params = new HashMap<>(); - - public QueueConfigInfo() { } - - public QueueConfigInfo(String queue, Map<String, String> params) { - this.queue = queue; - this.params = new HashMap<>(params); - } - - public String getQueue() { - return this.queue; - } - - public HashMap<String, String> getParams() { - return this.params; - } - -} http://git-wip-us.apache.org/repos/asf/hadoop/blob/09b7c876/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<QueueConfigInfo> addQueueInfo = new ArrayList<>(); - - @XmlElement(name = "remove-queue") - private ArrayList<String> removeQueueInfo = new ArrayList<>(); - - @XmlElement(name = "update-queue") - private ArrayList<QueueConfigInfo> updateQueueInfo = new ArrayList<>(); - - private HashMap<String, String> global = new HashMap<>(); - - public SchedConfUpdateInfo() { - // JAXB needs this - } - - public ArrayList<QueueConfigInfo> getAddQueueInfo() { - return addQueueInfo; - } - - public void setAddQueueInfo(ArrayList<QueueConfigInfo> addQueueInfo) { - this.addQueueInfo = addQueueInfo; - } - - public ArrayList<String> getRemoveQueueInfo() { - return removeQueueInfo; - } - - public void setRemoveQueueInfo(ArrayList<String> removeQueueInfo) { - this.removeQueueInfo = removeQueueInfo; - } - - public ArrayList<QueueConfigInfo> getUpdateQueueInfo() { - return updateQueueInfo; - } - - public void setUpdateQueueInfo(ArrayList<QueueConfigInfo> updateQueueInfo) { - this.updateQueueInfo = updateQueueInfo; - } - - @XmlElementWrapper(name = "global-updates") - public HashMap<String, String> getGlobalParams() { - return global; - } - - public void setGlobalParams(HashMap<String, String> globalInfo) { - this.global = globalInfo; - } -} --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org