Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions hadoop-ozone/dist/src/main/license/bin/LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -266,15 +266,10 @@ Apache License 2.0
=====================

ch.qos.reload4j:reload4j
com.amazonaws:aws-java-sdk-core
com.amazonaws:aws-java-sdk-kms
com.amazonaws:aws-java-sdk-s3
com.amazonaws:jmespath-java
com.carrotsearch:hppc
com.fasterxml.jackson.core:jackson-annotations
com.fasterxml.jackson.core:jackson-core
com.fasterxml.jackson.core:jackson-databind
com.fasterxml.jackson.dataformat:jackson-dataformat-cbor
com.fasterxml.jackson.dataformat:jackson-dataformat-xml
com.fasterxml.jackson.datatype:jackson-datatype-jsr310
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base
Expand Down
5 changes: 0 additions & 5 deletions hadoop-ozone/dist/src/main/license/jar-report.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ share/ozone/lib/asm-util.jar
share/ozone/lib/asm.jar
share/ozone/lib/aspectjrt.jar
share/ozone/lib/avro.jar
share/ozone/lib/aws-java-sdk-core.jar
share/ozone/lib/aws-java-sdk-kms.jar
share/ozone/lib/aws-java-sdk-s3.jar
share/ozone/lib/bcpkix-jdk18on.jar
share/ozone/lib/bcprov-jdk18on.jar
share/ozone/lib/bcutil-jdk18on.jar
Expand Down Expand Up @@ -97,7 +94,6 @@ share/ozone/lib/j2objc-annotations.jar
share/ozone/lib/jackson-annotations.jar
share/ozone/lib/jackson-core.jar
share/ozone/lib/jackson-databind.jar
share/ozone/lib/jackson-dataformat-cbor.jar
share/ozone/lib/jackson-dataformat-xml.jar
share/ozone/lib/jackson-datatype-jsr310.jar
share/ozone/lib/jackson-jaxrs-base.jar
Expand Down Expand Up @@ -161,7 +157,6 @@ share/ozone/lib/jgrapht-ext.jar
share/ozone/lib/jgraphx.jar
share/ozone/lib/jheaps.jar
share/ozone/lib/jline.jar
share/ozone/lib/jmespath-java.jar
share/ozone/lib/jnr-a64asm.jar
share/ozone/lib/jnr-constants.jar
share/ozone/lib/jnr-ffi.jar
Expand Down
27 changes: 12 additions & 15 deletions hadoop-ozone/dist/src/main/smoketest/fcq/s3_om_fcq.robot
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ Setup headers
Kinit test user testuser testuser.keytab
Setup secure v4 headers

Setup aws credentials
${accessKey} = Execute aws configure get aws_access_key_id
${secret} = Execute aws configure get aws_secret_access_key
Set Environment Variable AWS_SECRET_ACCESS_KEY ${secret}
Set Environment Variable AWS_ACCESS_KEY_ID ${accessKey}

Verify endpoint is up
[arguments] ${url}
Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit HTTP user
Expand All @@ -52,10 +46,16 @@ Verify endpoint is up
Setup bucket1
Execute AWSS3APICli create-bucket --bucket bucket1

Freon s3kg
[arguments] ${prefix}=s3bg ${n}=1000 ${threads}=10 ${args}=${EMPTY}
${result} = Execute ozone freon s3kg -e ${S3_ENDPOINT_URL} -t ${threads} -n ${n} -p ${prefix} ${args}
Should contain ${result} Successful executions: ${n}
Generate S3 load
[arguments] ${n}=100
# one aws process uploads all the files, several at a time
${dir} = Execute mktemp -d
Execute for i in $(seq 1 ${n}); do echo "$i" > ${dir}/key-$i; done
${result} = Execute AWSS3Cli cp --recursive ${dir} s3://bucket1/fcq/
Should contain ${result} upload:
# count the objects: the CLI merges the pages of the listing, which drops KeyCount
${count} = Execute AWSS3APICli list-objects-v2 --bucket bucket1 --prefix fcq/ --query 'length(Contents)'
Should Be Equal As Integers ${count} ${n}

Check metrics caller
${result} = Execute curl --negotiate -u : -LSs ${OM_JMX_ENDPOINT} | sed -n '/${DECAY_RPC_SCHEDULER_METRICS_NAME}/,/}/p' | grep 'Caller('
Expand All @@ -65,9 +65,6 @@ Check metrics caller
Test setup headers
Setup headers

Test setup credentials
Setup aws credentials

Test create bucket 1
Setup bucket1

Expand All @@ -78,8 +75,8 @@ Test metrics are registered
${result} = Execute curl --negotiate -u : -LSs ${OM_JMX_ENDPOINT} | grep ${DECAY_RPC_SCHEDULER_METRICS_NAME}
Should contain ${result} ${DECAY_RPC_SCHEDULER_METRICS_NAME}

Run freon s3kg
Freon s3kg
Run S3 load
Generate S3 load

Test caller from metrics
Check metrics caller
58 changes: 0 additions & 58 deletions hadoop-ozone/dist/src/main/smoketest/s3/freon.robot

This file was deleted.

4 changes: 1 addition & 3 deletions hadoop-ozone/dist/src/shell/conf/log4j.properties
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,7 @@ log4j.logger.http.requests=${ozone.http.request.logger}
#log4j.logger.http.requests.webhdfs=INFO,HttpAccess

# Custom Logging levels
# AWS SDK & S3A FileSystem
#log4j.logger.com.amazonaws=ERROR
log4j.logger.com.amazonaws.http.AmazonHttpClient=ERROR
# S3A FileSystem
#log4j.logger.org.apache.hadoop.fs.s3a.S3AFileSystem=WARN

# Log levels of third-party libraries
Expand Down
8 changes: 0 additions & 8 deletions hadoop-ozone/freon/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,6 @@
</properties>

<dependencies>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
</dependency>
<dependency>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-s3</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading