HDFS-10170. DiskBalancer: Force rebase diskbalancer branch. Contributed by Anu Engineer

This commit is contained in:
Anu Engineer 2016-03-15 11:45:24 -07:00 committed by Arpit Agarwal
parent 75a711a2d5
commit ec601673a8

View File

@ -1,19 +1,18 @@
/** /**
* Licensed to the Apache Software Foundation (ASF) under one * Licensed to the Apache Software Foundation (ASF) under one or more
* or more contributor license agreements. See the NOTICE file * contributor license agreements. See the NOTICE file distributed with this
* distributed with this work for additional information * work for additional information regarding copyright ownership. The ASF
* regarding copyright ownership. The ASF licenses this file * licenses this file to you under the Apache License, Version 2.0 (the
* to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance with the License.
* "License"); you may not use this file except in compliance * You may obtain a copy of the License at
* with the License. You may obtain a copy of the License at * <p/>
* * http://www.apache.org/licenses/LICENSE-2.0
* http://www.apache.org/licenses/LICENSE-2.0 * <p/>
*
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* See the License for the specific language governing permissions and * License for the specific language governing permissions and limitations under
* limitations under the License. * the License.
*/ */
package org.apache.hadoop.hdfs.server.diskbalancer; package org.apache.hadoop.hdfs.server.diskbalancer;
@ -23,7 +22,6 @@
* Disk Balancer Exceptions. * Disk Balancer Exceptions.
*/ */
public class DiskBalancerException extends IOException { public class DiskBalancerException extends IOException {
/** Possible results from DiskBalancer. **/
public enum Result { public enum Result {
DISK_BALANCER_NOT_ENABLED, DISK_BALANCER_NOT_ENABLED,
INVALID_PLAN_VERSION, INVALID_PLAN_VERSION,
@ -35,9 +33,7 @@ public enum Result {
PLAN_ALREADY_IN_PROGRESS, PLAN_ALREADY_IN_PROGRESS,
INVALID_VOLUME, INVALID_VOLUME,
INVALID_MOVE, INVALID_MOVE,
INTERNAL_ERROR, INTERNAL_ERROR
NO_SUCH_PLAN,
UNKNOWN_KEY
} }
private final Result result; private final Result result;