This is an automated email from the ASF dual-hosted git repository.
elek 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 cb35ed8 Revert "HDDS-3461. Add acceptance test to smoketest CSI
service startup"
cb35ed8 is described below
commit cb35ed8fad9a651a4b19dd917cfd6f950526598a
Author: Elek Márton <[email protected]>
AuthorDate: Fri Apr 24 22:01:39 2020 +0200
Revert "HDDS-3461. Add acceptance test to smoketest CSI service startup"
This reverts commit c973baca39f5237425e07ca2a7d2fcdb645a0799.
---
hadoop-ozone/csi/pom.xml | 12 +----
hadoop-ozone/dev-support/intellij/ozone-site.xml | 8 ---
.../intellij/runConfigurations/CsiServer.xml | 33 ------------
hadoop-ozone/dist/pom.xml | 2 +-
hadoop-ozone/dist/src/main/compose/ozone-csi/.env | 18 -------
.../src/main/compose/ozone-csi/docker-compose.yaml | 59 ----------------------
.../dist/src/main/compose/ozone-csi/docker-config | 32 ------------
.../dist/src/main/compose/ozone-csi/test.sh | 33 ------------
hadoop-ozone/dist/src/main/smoketest/csi.robot | 27 ----------
9 files changed, 3 insertions(+), 221 deletions(-)
diff --git a/hadoop-ozone/csi/pom.xml b/hadoop-ozone/csi/pom.xml
index 1050966..c6eaf3d 100644
--- a/hadoop-ozone/csi/pom.xml
+++ b/hadoop-ozone/csi/pom.xml
@@ -76,20 +76,12 @@ http://maven.apache.org/xsd/maven-4.0.0.xsd";>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
- <version>4.1.38.Final</version>
+ <version>4.1.30.Final</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
- <version>4.1.38.Final</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <version>4.1.30.Final</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
diff --git a/hadoop-ozone/dev-support/intellij/ozone-site.xml
b/hadoop-ozone/dev-support/intellij/ozone-site.xml
index 3fde850..d2b9b64 100644
--- a/hadoop-ozone/dev-support/intellij/ozone-site.xml
+++ b/hadoop-ozone/dev-support/intellij/ozone-site.xml
@@ -24,14 +24,6 @@
<value>localhost</value>
</property>
<property>
- <name>ozone.csi.owner</name>
- <value>hadoop</value>
- </property>
- <property>
- <name>ozone.csi.socket</name>
- <value>/tmp/csi.sock</value>
- </property>
- <property>
<name>ozone.scm.client.address</name>
<value>localhost</value>
</property>
diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml
b/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml
deleted file mode 100644
index d3bb7ab..0000000
--- a/hadoop-ozone/dev-support/intellij/runConfigurations/CsiServer.xml
+++ /dev/null
@@ -1,33 +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.
--->
-<component name="ProjectRunConfigurationManager">
- <configuration default="false" name="CsiServer" type="Application"
factoryName="Application" nameIsGenerated="true">
- <option name="MAIN_CLASS_NAME"
value="org.apache.hadoop.ozone.csi.CsiServer" />
- <module name="hadoop-ozone-csi" />
- <option name="PROGRAM_PARAMETERS"
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
- <option name="VM_PARAMETERS"
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
/>
- <extension name="coverage">
- <pattern>
- <option name="PATTERN" value="org.apache.hadoop.ozone.csi.*" />
- <option name="ENABLED" value="true" />
- </pattern>
- </extension>
- <method v="2">
- <option name="Make" enabled="true" />
- </method>
- </configuration>
-</component>
\ No newline at end of file
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 87435c9..e892053 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -28,7 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
- <docker.ozone-runner.version>20200420-1</docker.ozone-runner.version>
+ <docker.ozone-runner.version>20200403-1</docker.ozone-runner.version>
</properties>
<build>
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/.env
b/hadoop-ozone/dist/src/main/compose/ozone-csi/.env
deleted file mode 100644
index 96ab163..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/.env
+++ /dev/null
@@ -1,18 +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.
-
-HDDS_VERSION=${hdds.version}
-OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
deleted file mode 100644
index e175dfa..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-compose.yaml
+++ /dev/null
@@ -1,59 +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.
-
-version: "3.4"
-
-services:
- datanode:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- volumes:
- - ../..:/opt/hadoop
- env_file:
- - docker-config
- ports:
- - 9864
- - 9882
- command: ["ozone","datanode"]
- om:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- volumes:
- - ../..:/opt/hadoop
- env_file:
- - docker-config
- environment:
- ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
- ports:
- - 9874:9874
- - 9862:9862
- command: ["ozone","om"]
- scm:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- volumes:
- - ../..:/opt/hadoop
- env_file:
- - docker-config
- ports:
- - 9876:9876
- environment:
- ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
- command: ["ozone","scm"]
- csi:
- image: apache/ozone-runner:${OZONE_RUNNER_VERSION}
- volumes:
- - ../..:/opt/hadoop
- env_file:
- - docker-config
- command: ["ozone","csi"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-config
b/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-config
deleted file mode 100644
index adc6646..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/docker-config
+++ /dev/null
@@ -1,32 +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.
-
-OZONE-SITE.XML_ozone.csi.owner=hadoop
-OZONE-SITE.XML_ozone.csi.socket=/tmp/csi.sock
-
-OZONE-SITE.XML_ozone.om.address=om
-OZONE-SITE.XML_ozone.om.http-address=om:9874
-OZONE-SITE.XML_ozone.scm.container.size=1GB
-OZONE-SITE.XML_ozone.scm.pipeline.owner.container.count=1
-OZONE-SITE.XML_ozone.scm.names=scm
-OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data
-OZONE-SITE.XML_ozone.scm.block.client.address=scm
-OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
-OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
-OZONE-SITE.XML_ozone.scm.client.address=scm
-OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
-
-no_proxy=om,scm,csi,s3g,kdc,localhost,127.0.0.1
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-csi/test.sh
b/hadoop-ozone/dist/src/main/compose/ozone-csi/test.sh
deleted file mode 100755
index 2a6e5f1..0000000
--- a/hadoop-ozone/dist/src/main/compose/ozone-csi/test.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-# 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.
-
-COMPOSE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd)"
-export COMPOSE_DIR
-
-export SECURITY_ENABLED=false
-export OZONE_REPLICATION_FACTOR=3
-
-# shellcheck source=/dev/null
-source "$COMPOSE_DIR/../testlib.sh"
-
-start_docker_env
-
-execute_robot_test csi csi.robot
-
-stop_docker_env
-
-generate_report
diff --git a/hadoop-ozone/dist/src/main/smoketest/csi.robot
b/hadoop-ozone/dist/src/main/smoketest/csi.robot
deleted file mode 100644
index de01ebf..0000000
--- a/hadoop-ozone/dist/src/main/smoketest/csi.robot
+++ /dev/null
@@ -1,27 +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.
-
-*** Settings ***
-Documentation Smoketest Ozone CSI service
-Library OperatingSystem
-Library BuiltIn
-Library String
-Resource commonlib.robot
-Test Timeout 1 minutes
-
-*** Test Cases ***
-Test CSI identitiy service
- ${result} = Execute csc -e
unix:///tmp/csi.sock identity plugin-info
- Should Contain ${result}
org.apache.hadoop.ozone
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
