You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2020/07/22 04:12:14 UTC
[hadoop-ozone] branch master updated: HDDS-3992. Remove project
skeleton of in-place upgrade feature (#1225)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 937f36f HDDS-3992. Remove project skeleton of in-place upgrade feature (#1225)
937f36f is described below
commit 937f36fb4f8ed2f83d4f1f43bc06dec407b9eb77
Author: Elek, Márton <el...@users.noreply.github.com>
AuthorDate: Wed Jul 22 06:11:57 2020 +0200
HDDS-3992. Remove project skeleton of in-place upgrade feature (#1225)
---
hadoop-ozone/dist/pom.xml | 7 +--
hadoop-ozone/dist/src/shell/ozone/ozone | 5 --
hadoop-ozone/pom.xml | 6 ---
hadoop-ozone/upgrade/pom.xml | 57 ----------------------
.../org/apache/hadoop/ozone/upgrade/Balance.java | 38 ---------------
.../org/apache/hadoop/ozone/upgrade/Execute.java | 37 --------------
.../hadoop/ozone/upgrade/InPlaceUpgrade.java | 45 -----------------
.../java/org/apache/hadoop/ozone/upgrade/Plan.java | 38 ---------------
.../apache/hadoop/ozone/upgrade/package-info.java | 23 ---------
9 files changed, 1 insertion(+), 255 deletions(-)
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index a766c0a..343bc9b 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -50,8 +50,7 @@
<includes>*.classpath</includes>
<includeArtifactIds>
hadoop-hdds-server-scm,hadoop-ozone-common,hadoop-ozone-csi,hadoop-ozone-datanode,hadoop-ozone-insight,
- hadoop-ozone-ozone-manager,hadoop-ozone-recon,hadoop-ozone-s3gateway,hadoop-ozone-tools,
- hadoop-ozone-upgrade
+ hadoop-ozone-ozone-manager,hadoop-ozone-recon,hadoop-ozone-s3gateway,hadoop-ozone-tools
</includeArtifactIds>
</configuration>
</execution>
@@ -221,10 +220,6 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-ozone-upgrade</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-ozone-insight</artifactId>
</dependency>
</dependencies>
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone
index 42e8dca..e957f7f 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -54,7 +54,6 @@ function hadoop_usage
hadoop_add_subcommand "insight" client "tool to get runtime operation information"
hadoop_add_subcommand "version" client "print the version"
hadoop_add_subcommand "dtutil" client "operations related to delegation tokens"
- hadoop_add_subcommand "upgrade" client "HDFS to Ozone in-place upgrade tool"
hadoop_add_subcommand "admin" client "Ozone admin tool"
hadoop_add_subcommand "debug" client "Ozone debug tool"
@@ -214,10 +213,6 @@ function ozonecmd_case
HADOOP_CLASSNAME=org.apache.hadoop.security.token.DtUtilShell
OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
;;
- upgrade)
- HADOOP_CLASSNAME=org.apache.hadoop.ozone.upgrade.InPlaceUpgrade
- OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-upgrade"
- ;;
admin)
HADOOP_CLASSNAME=org.apache.hadoop.ozone.admin.OzoneAdmin
OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
diff --git a/hadoop-ozone/pom.xml b/hadoop-ozone/pom.xml
index 1b28ea4..8d76618 100644
--- a/hadoop-ozone/pom.xml
+++ b/hadoop-ozone/pom.xml
@@ -41,7 +41,6 @@
<module>datanode</module>
<module>s3gateway</module>
<module>dist</module>
- <module>upgrade</module>
<module>csi</module>
<module>fault-injection-test</module>
<module>insight</module>
@@ -213,11 +212,6 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-ozone-upgrade</artifactId>
- <version>${ozone.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdds-container-service</artifactId>
<version>${hdds.version}</version>
<type>test-jar</type>
diff --git a/hadoop-ozone/upgrade/pom.xml b/hadoop-ozone/upgrade/pom.xml
deleted file mode 100644
index ed80d9c..0000000
--- a/hadoop-ozone/upgrade/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed 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. See accompanying LICENSE file.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-https://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-ozone</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </parent>
- <artifactId>hadoop-ozone-upgrade</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- <description>Apache Hadoop Ozone In-Place Upgrade</description>
- <name>Apache Hadoop Ozone In-Place Upgrade</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdds-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-hdds-common</artifactId>
- </dependency>
- <dependency>
- <groupId>com.github.spotbugs</groupId>
- <artifactId>spotbugs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Balance.java b/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Balance.java
deleted file mode 100644
index 1492738..0000000
--- a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Balance.java
+++ /dev/null
@@ -1,38 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ozone.upgrade;
-
-import java.util.concurrent.Callable;
-
-import picocli.CommandLine.Command;
-
-/**
- * Command to move blocks between HDFS datanodes.
- */
-@Command(name = "balance",
- description = "Move the HDFS blocks for a better distribution "
- + "usage.")
-public class Balance implements Callable<Void> {
-
- @Override
- public Void call() throws Exception {
- System.err.println("[In-Place upgrade : balance] is not yet supported.");
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Execute.java b/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Execute.java
deleted file mode 100644
index 0837200..0000000
--- a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Execute.java
+++ /dev/null
@@ -1,37 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ozone.upgrade;
-
-import java.util.concurrent.Callable;
-
-import picocli.CommandLine.Command;
-
-/**
- * Execute Ozone specific HDFS ballanced..
- */
-@Command(name = "execute",
- description = "Start/restart upgrade from HDFS to Ozone cluster.")
-public class Execute implements Callable<Void> {
-
- @Override
- public Void call() throws Exception {
- System.err.println("In-Place upgrade : execute] is not yet supported.");
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/InPlaceUpgrade.java b/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/InPlaceUpgrade.java
deleted file mode 100644
index b307f44..0000000
--- a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/InPlaceUpgrade.java
+++ /dev/null
@@ -1,45 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ozone.upgrade;
-
-import org.apache.hadoop.hdds.cli.GenericCli;
-import org.apache.hadoop.hdds.cli.HddsVersionProvider;
-
-import picocli.CommandLine.Command;
-
-/**
- * Command line interface for the In-Place upgrade utility.
- * <p>
- * In-Place upgrade can convert HDFS cluster data to Ozone data without
- * (or minimal) data moving.
- */
-@Command(name = "ozone upgrade",
- description = "Convert raw HDFS data to Ozone data without data movement.",
- subcommands = {
- Plan.class,
- Balance.class,
- Execute.class,
- },
- versionProvider = HddsVersionProvider.class,
- mixinStandardHelpOptions = true)
-public class InPlaceUpgrade extends GenericCli {
-
- public static void main(String[] args) {
- new InPlaceUpgrade().run(args);
- }
-}
diff --git a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Plan.java b/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Plan.java
deleted file mode 100644
index efd6092..0000000
--- a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/Plan.java
+++ /dev/null
@@ -1,38 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ozone.upgrade;
-
-import java.util.concurrent.Callable;
-
-import picocli.CommandLine.Command;
-
-/**
- * Command to calculate statistics and estimate the upgrade.
- */
-@Command(name = "plan",
- description = "Plan existing HDFS block distribution and give."
- + "estimation.")
-public class Plan implements Callable<Void> {
-
- @Override
- public Void call() throws Exception {
- System.err.println("[In-Place upgrade : plan] is not yet supported.");
- return null;
- }
-
-}
diff --git a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/package-info.java b/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/package-info.java
deleted file mode 100644
index b147683..0000000
--- a/hadoop-ozone/upgrade/src/main/java/org/apache/hadoop/ozone/upgrade/package-info.java
+++ /dev/null
@@ -1,23 +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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.ozone.upgrade;
-
-/**
- * In-Place upgrade utility to upgrade HDDS to Ozone cluster..
- */
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-commits-help@hadoop.apache.org