Skip to content

HDDS-6955. [Ozone-streaming] Add explicit stream flag in ozone shell #3559

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

Merged
captainzmc merged 2 commits into from
Jul 12, 2022
Merged

HDDS-6955. [Ozone-streaming] Add explicit stream flag in ozone shell #3559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6946674
Add stream option in ozone sh key
kaijchen Jun 27, 2022
dcd4dfb
Move code to separated methods
szetszwo Jul 1, 2022
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
11 changes: 11 additions & 0 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/ReplicationConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,17 @@ static ReplicationConfig getDefault(ConfigurationSource config) {
return parse(null, replication, config);
}

static ReplicationConfig resolve(ReplicationConfig replicationConfig,
ReplicationConfig bucketReplicationConfig, ConfigurationSource conf) {
if (replicationConfig == null) {
replicationConfig = bucketReplicationConfig;
}
if (replicationConfig == null) {
replicationConfig = getDefault(conf);
}
return replicationConfig;
}

/**
* Helper method to serialize from proto.
* <p>
Expand Down
90 changes: 56 additions & 34 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.util.HashMap;
import java.util.Map;

import com.google.common.base.Preconditions;
import org.apache.hadoop.conf.StorageUnit;
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
Expand All @@ -42,13 +43,13 @@
import org.apache.hadoop.ozone.shell.OzoneAddress;

import org.apache.commons.codec.digest.DigestUtils;
import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationType.EC;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CHUNK_SIZE_DEFAULT;
import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CHUNK_SIZE_KEY;

import org.apache.hadoop.ozone.shell.ShellReplicationOptions;
import picocli.CommandLine.Command;
import picocli.CommandLine.Mixin;
import picocli.CommandLine.Option;
import picocli.CommandLine.Parameters;

/**
Expand All @@ -61,6 +62,9 @@ public class PutKeyHandler extends KeyHandler {
@Parameters(index = "1", arity = "1..1", description = "File to upload")
private String fileName;

@Option(names = "--stream")
private boolean stream;

@Mixin
private ShellReplicationOptions replication;

Expand Down Expand Up @@ -96,41 +100,59 @@ protected void execute(OzoneClient client, OzoneAddress address)
int chunkSize = (int) getConf().getStorageSize(OZONE_SCM_CHUNK_SIZE_KEY,
OZONE_SCM_CHUNK_SIZE_DEFAULT, StorageUnit.BYTES);

Boolean useAsync = false;
if (dataFile.length() <= chunkSize ||
(replicationConfig != null &&
replicationConfig.getReplicationType() == EC) ||
bucket.getReplicationConfig() instanceof ECReplicationConfig) {
useAsync = true;
}
if (useAsync) {
if (isVerbose()) {
out().println("API: async");
}
try (InputStream input = new FileInputStream(dataFile);
OutputStream output = bucket.createKey(keyName, dataFile.length(),
replicationConfig, keyMetadata)) {
IOUtils.copyBytes(input, output, chunkSize);
}
if (stream) {
stream(dataFile, bucket, keyName, keyMetadata,
replicationConfig, chunkSize);
} else {
if (isVerbose()) {
out().println("API: streaming");
}
try (RandomAccessFile raf = new RandomAccessFile(dataFile, "r");
OzoneDataStreamOutput out = bucket.createStreamKey(keyName,
dataFile.length(), replicationConfig, keyMetadata)) {
FileChannel ch = raf.getChannel();
long len = raf.length();
long off = 0;
while (len > 0) {
long writeLen = Math.min(len, chunkSize);
ByteBuffer bb = ch.map(FileChannel.MapMode.READ_ONLY, off, writeLen);
out.write(bb);
off += writeLen;
len -= writeLen;
}
}
async(dataFile, bucket, keyName, keyMetadata,
replicationConfig, chunkSize);
}
}

void async(
File dataFile, OzoneBucket bucket,
String keyName, Map<String, String> keyMetadata,
ReplicationConfig replicationConfig, int chunkSize)
throws IOException {
if (isVerbose()) {
out().println("API: async");
}
try (InputStream input = new FileInputStream(dataFile);
OutputStream output = bucket.createKey(keyName, dataFile.length(),
replicationConfig, keyMetadata)) {
IOUtils.copyBytes(input, output, chunkSize);
}
}

void stream(
File dataFile, OzoneBucket bucket,
String keyName, Map<String, String> keyMetadata,
ReplicationConfig replicationConfig, int chunkSize)
throws IOException {
if (isVerbose()) {
out().println("API: streaming");
}
// In streaming mode, always resolve replication config at client side,
// because streaming is not compatible for writing EC keys.
replicationConfig = ReplicationConfig.resolve(replicationConfig,
bucket.getReplicationConfig(), getConf());
Preconditions.checkArgument(
!(replicationConfig instanceof ECReplicationConfig),
"Can not put EC key by streaming");

try (RandomAccessFile raf = new RandomAccessFile(dataFile, "r");
OzoneDataStreamOutput out = bucket.createStreamKey(keyName,
dataFile.length(), replicationConfig, keyMetadata)) {
FileChannel ch = raf.getChannel();
long len = raf.length();
long off = 0;
while (len > 0) {
long writeLen = Math.min(len, chunkSize);
ByteBuffer bb = ch.map(FileChannel.MapMode.READ_ONLY, off, writeLen);
out.write(bb);
off += writeLen;
len -= writeLen;
}
}
}
}