Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HDDS-3340. Move Ozone Shell from ozone-manager to tools #775

Closed
wants to merge 6 commits into from
Closed

HDDS-3340. Move Ozone Shell from ozone-manager to tools #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a2715f9
HDDS-3340. Move Ozone Shell from ozone-manager to tools
adoroszlai Apr 4, 2020
d7dfa1d
trigger new CI check
adoroszlai Apr 5, 2020
6e35eef
trigger new CI check
adoroszlai Apr 5, 2020
c9b7de5
trigger new CI check
adoroszlai Apr 5, 2020
9bace72
Merge remote-tracking branch 'origin/master' into HDDS-3340
adoroszlai Apr 7, 2020
1f2255b
Merge remote-tracking branch 'origin/master' into HDDS-3340
adoroszlai Apr 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 5 additions & 16 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
/*
* 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
Expand All @@ -15,21 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone;

/**
This package contains class that support ozone implementation on the datanode
side.

Main parts of ozone on datanode are:

1. REST Interface - This code lives under the web directory and listens to the
WebHDFS port.

2. Datanode container classes: This support persistence of ozone objects on
datanode. These classes live under container directory.

3. Client and Shell: We also support a ozone REST client lib, they are under
web/client and web/ozShell.

* This package contains class that support ozone implementation on the datanode
* side. Datanode container classes support persistence of ozone objects on
* datanode. These classes live under container directory.
*/
package org.apache.hadoop.ozone;
6 changes: 3 additions & 3 deletions hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
-->
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="OzoneShell" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.web.ozShell.OzoneShell" />
<module name="hadoop-ozone-ozone-manager" />
<option name="MAIN_CLASS_NAME" value="org.apache.hadoop.ozone.shell.OzoneShell" />
<module name="hadoop-ozone-tools" />
<option name="PROGRAM_PARAMETERS" value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml volume create /vol1" />
<option name="VM_PARAMETERS" value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties" />
<extension name="coverage">
Expand All @@ -30,4 +30,4 @@
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
</component>
8 changes: 4 additions & 4 deletions hadoop-ozone/dist/src/shell/ozone/ozone
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ function ozonecmd_case
OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager"
;;
sh | shell)
HADOOP_CLASSNAME=org.apache.hadoop.ozone.web.ozShell.OzoneShell
HADOOP_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneShell
HDFS_OM_SH_OPTS="${HDFS_OM_SH_OPTS} -Dhadoop.log.file=ozone-shell.log
-Dlog4j.configuration=file:${ozone_shell_log4j}"
HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_OM_SH_OPTS}"
OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager"
OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
;;
s3)
HADOOP_CLASSNAME=org.apache.hadoop.ozone.web.ozShell.s3.S3Shell
OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager"
HADOOP_CLASSNAME=org.apache.hadoop.ozone.shell.s3.S3Shell
OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools"
;;
scm)
HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true"
Expand Down
2 changes: 1 addition & 1 deletion ...ozone/ozShell/TestOzoneDatanodeShell.java → ...p/ozone/shell/TestOzoneDatanodeShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.ozShell;
package org.apache.hadoop.ozone.shell;

import static org.junit.Assert.fail;

Expand Down
6 changes: 2 additions & 4 deletions ...adoop/ozone/ozShell/TestOzoneShellHA.java → .../hadoop/ozone/shell/TestOzoneShellHA.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.ozShell;
package org.apache.hadoop.ozone.shell;

import com.google.common.base.Strings;
import org.apache.hadoop.fs.FileUtil;
Expand All @@ -26,9 +26,7 @@
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.om.OMConfigKeys;
import org.apache.hadoop.ozone.om.OzoneManager;
import org.apache.hadoop.ozone.web.ozShell.OzoneShell;
import org.apache.hadoop.ozone.web.ozShell.Shell;
import org.apache.hadoop.ozone.web.ozShell.s3.S3Shell;
import org.apache.hadoop.ozone.shell.s3.S3Shell;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.After;
Expand Down
4 changes: 2 additions & 2 deletions ...che/hadoop/ozone/ozShell/TestS3Shell.java → ...pache/hadoop/ozone/shell/TestS3Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.ozShell;
package org.apache.hadoop.ozone.shell;

import com.google.common.base.Strings;
import org.apache.hadoop.fs.FileUtil;
Expand All @@ -27,7 +27,7 @@
import org.apache.hadoop.ozone.client.rpc.RpcClient;
import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.ServiceInfo;
import org.apache.hadoop.ozone.web.ozShell.s3.S3Shell;
import org.apache.hadoop.ozone.shell.s3.S3Shell;
import org.apache.hadoop.test.GenericTestUtils;
import org.junit.After;
import org.junit.AfterClass;
Expand Down
24 changes: 0 additions & 24 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/package-info.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...che/hadoop/ozone/web/ozShell/Handler.java → ...rg/apache/hadoop/ozone/shell/Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.web.ozShell;
package org.apache.hadoop.ozone.shell;

import java.io.IOException;
import java.io.PrintStream;
Expand Down
2 changes: 1 addition & 1 deletion ...hadoop/ozone/web/ozShell/ListOptions.java → ...pache/hadoop/ozone/shell/ListOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell;
package org.apache.hadoop.ozone.shell;

import picocli.CommandLine;

Expand Down
2 changes: 1 addition & 1 deletion ...adoop/ozone/web/ozShell/OzoneAddress.java → ...ache/hadoop/ozone/shell/OzoneAddress.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell;
package org.apache.hadoop.ozone.shell;

import java.io.IOException;
import java.io.PrintStream;
Expand Down
10 changes: 5 additions & 5 deletions .../hadoop/ozone/web/ozShell/OzoneShell.java → ...apache/hadoop/ozone/shell/OzoneShell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell;
package org.apache.hadoop.ozone.shell;

import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.tracing.TracingUtil;
import org.apache.hadoop.ozone.web.ozShell.bucket.BucketCommands;
import org.apache.hadoop.ozone.web.ozShell.keys.KeyCommands;
import org.apache.hadoop.ozone.web.ozShell.token.TokenCommands;
import org.apache.hadoop.ozone.web.ozShell.volume.VolumeCommands;
import org.apache.hadoop.ozone.shell.bucket.BucketCommands;
import org.apache.hadoop.ozone.shell.keys.KeyCommands;
import org.apache.hadoop.ozone.shell.token.TokenCommands;
import org.apache.hadoop.ozone.shell.volume.VolumeCommands;

import io.opentracing.Scope;
import io.opentracing.util.GlobalTracer;
Expand Down
2 changes: 1 addition & 1 deletion ...pache/hadoop/ozone/web/ozShell/Shell.java → .../org/apache/hadoop/ozone/shell/Shell.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.web.ozShell;
package org.apache.hadoop.ozone.shell;

import org.apache.hadoop.hdds.cli.GenericCli;
import org.apache.hadoop.ozone.om.exceptions.OMException;
Expand Down
2 changes: 1 addition & 1 deletion ...op/ozone/web/ozShell/StoreTypeOption.java → ...e/hadoop/ozone/shell/StoreTypeOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell;
package org.apache.hadoop.ozone.shell;

import org.apache.hadoop.ozone.security.acl.OzoneObj;
import picocli.CommandLine;
Expand Down
8 changes: 4 additions & 4 deletions ...oop/ozone/web/ozShell/acl/AclHandler.java → ...he/hadoop/ozone/shell/acl/AclHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.acl;
package org.apache.hadoop.ozone.shell.acl;

import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.web.ozShell.Handler;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import org.apache.hadoop.ozone.shell.StoreTypeOption;
import org.apache.hadoop.ozone.shell.Handler;

import org.apache.hadoop.ozone.web.ozShell.StoreTypeOption;
import picocli.CommandLine;

import java.io.IOException;
Expand Down
2 changes: 1 addition & 1 deletion ...doop/ozone/web/ozShell/acl/AclOption.java → ...che/hadoop/ozone/shell/acl/AclOption.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.acl;
package org.apache.hadoop.ozone.shell.acl;

import com.google.common.collect.ImmutableList;
import org.apache.hadoop.ozone.OzoneAcl;
Expand Down
2 changes: 1 addition & 1 deletion .../ozone/web/ozShell/acl/GetAclHandler.java → ...hadoop/ozone/shell/acl/GetAclHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.acl;
package org.apache.hadoop.ozone.shell.acl;

import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.client.OzoneClient;
Expand Down
2 changes: 1 addition & 1 deletion ...p/ozone/web/ozShell/acl/package-info.java → .../hadoop/ozone/shell/acl/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
/**
* Helpers for ACL commands.
*/
package org.apache.hadoop.ozone.web.ozShell.acl;
package org.apache.hadoop.ozone.shell.acl;
8 changes: 4 additions & 4 deletions ...b/ozShell/bucket/AddAclBucketHandler.java → ...one/shell/bucket/AddAclBucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.security.acl.OzoneObj;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler;
import org.apache.hadoop.ozone.web.ozShell.acl.AclOption;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import org.apache.hadoop.ozone.shell.acl.AclHandler;
import org.apache.hadoop.ozone.shell.acl.AclOption;
import picocli.CommandLine;

import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions ...ne/web/ozShell/bucket/BucketCommands.java → ...op/ozone/shell/bucket/BucketCommands.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import java.util.concurrent.Callable;

import org.apache.hadoop.hdds.cli.GenericParentCommand;
import org.apache.hadoop.hdds.cli.HddsVersionProvider;
import org.apache.hadoop.hdds.cli.MissingSubcommandException;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.ozone.web.ozShell.Shell;
import org.apache.hadoop.ozone.shell.Shell;

import picocli.CommandLine.Command;
import picocli.CommandLine.ParentCommand;
Expand Down
6 changes: 3 additions & 3 deletions ...one/web/ozShell/bucket/BucketHandler.java → ...oop/ozone/shell/bucket/BucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import org.apache.hadoop.ozone.web.ozShell.Handler;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.shell.Handler;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import picocli.CommandLine;

/**
Expand Down
6 changes: 3 additions & 3 deletions ...p/ozone/web/ozShell/bucket/BucketUri.java → .../hadoop/ozone/shell/bucket/BucketUri.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import org.apache.hadoop.ozone.client.OzoneClientException;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.web.ozShell.Shell;
import org.apache.hadoop.ozone.shell.Shell;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import picocli.CommandLine;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...b/ozShell/bucket/CreateBucketHandler.java → ...one/shell/bucket/CreateBucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import org.apache.hadoop.hdds.protocol.StorageType;
import org.apache.hadoop.ozone.OzoneConsts;
import org.apache.hadoop.ozone.client.BucketArgs;
import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.shell.OzoneAddress;

import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
Expand Down
4 changes: 2 additions & 2 deletions ...b/ozShell/bucket/DeleteBucketHandler.java → ...one/shell/bucket/DeleteBucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.shell.OzoneAddress;

import picocli.CommandLine.Command;

Expand Down
8 changes: 4 additions & 4 deletions ...b/ozShell/bucket/GetAclBucketHandler.java → ...one/shell/bucket/GetAclBucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler;
import org.apache.hadoop.ozone.web.ozShell.acl.GetAclHandler;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import org.apache.hadoop.ozone.shell.acl.AclHandler;
import org.apache.hadoop.ozone.shell.acl.GetAclHandler;
import picocli.CommandLine;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...web/ozShell/bucket/InfoBucketHandler.java → ...ozone/shell/bucket/InfoBucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.shell.OzoneAddress;

import picocli.CommandLine.Command;

Expand Down
8 changes: 4 additions & 4 deletions ...web/ozShell/bucket/ListBucketHandler.java → ...ozone/shell/bucket/ListBucketHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,18 @@
* limitations under the License.
*/

package org.apache.hadoop.ozone.web.ozShell.bucket;
package org.apache.hadoop.ozone.shell.bucket;

import java.io.IOException;
import java.util.Iterator;

import org.apache.hadoop.ozone.client.OzoneBucket;
import org.apache.hadoop.ozone.client.OzoneClient;
import org.apache.hadoop.ozone.client.OzoneVolume;
import org.apache.hadoop.ozone.web.ozShell.ListOptions;
import org.apache.hadoop.ozone.web.ozShell.OzoneAddress;
import org.apache.hadoop.ozone.shell.ListOptions;
import org.apache.hadoop.ozone.shell.OzoneAddress;
import org.apache.hadoop.ozone.shell.volume.VolumeHandler;

import org.apache.hadoop.ozone.web.ozShell.volume.VolumeHandler;
import picocli.CommandLine;
import picocli.CommandLine.Command;

Expand Down
Loading