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
Original file line number Diff line number Diff line change
Expand Up @@ -57,15 +57,15 @@ public void setPath(String dbPath) {
public Void call() throws Exception {
OzoneConfiguration configuration = new OzoneConfiguration();
URI uri = URI.create(this.path);
FileSystem fs = FileSystem.get(uri, configuration);
try (FileSystem fs = FileSystem.get(uri, configuration)) {

if (fs instanceof LeaseRecoverable) {
((LeaseRecoverable) fs).recoverLease(new Path(uri));
} else {
throw new IllegalArgumentException("Unsupported file system: "
+ fs.getScheme());
if (fs instanceof LeaseRecoverable) {
((LeaseRecoverable) fs).recoverLease(new Path(uri));
} else {
throw new IllegalArgumentException("Unsupported file system: "
+ fs.getScheme());
}
}

System.out.println("Lease recovery SUCCEEDED on " + uri);

return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,10 @@ private boolean cleanFSBucket(OzoneBucket bucket) {
final Path path = new Path(ofsPrefix);
OzoneConfiguration clientConf = new OzoneConfiguration(getConf());
clientConf.set(FS_DEFAULT_NAME_KEY, hostPrefix);
FileSystem fs = FileSystem.get(clientConf);
if (!fs.delete(path, true)) {
throw new IOException("Failed to delete bucket");
try (FileSystem fs = FileSystem.get(clientConf)) {
if (!fs.delete(path, true)) {
throw new IOException("Failed to delete bucket");
}
}
numberOfBucketsCleaned.getAndIncrement();
return true;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1209,20 +1209,20 @@ public void run() {
try {
KeyValidate kv = validationQueue.poll(5, TimeUnit.SECONDS);
if (kv != null) {
OzoneInputStream is = kv.bucket.readKey(kv.keyName);
dig.getMessageDigest().reset();
byte[] curDigest = dig.digest(is);
totalWritesValidated.getAndIncrement();
if (MessageDigest.isEqual(kv.digest, curDigest)) {
writeValidationSuccessCount.getAndIncrement();
} else {
writeValidationFailureCount.getAndIncrement();
LOG.warn("Data validation error for key {}/{}/{}",
kv.bucket.getVolumeName(), kv.bucket, kv.keyName);
LOG.warn("Expected checksum: {}, Actual checksum: {}",
kv.digest, curDigest);
try (OzoneInputStream is = kv.bucket.readKey(kv.keyName)) {
dig.getMessageDigest().reset();
byte[] curDigest = dig.digest(is);
totalWritesValidated.getAndIncrement();
if (MessageDigest.isEqual(kv.digest, curDigest)) {
writeValidationSuccessCount.getAndIncrement();
} else {
writeValidationFailureCount.getAndIncrement();
LOG.warn("Data validation error for key {}/{}/{}",
kv.bucket.getVolumeName(), kv.bucket, kv.keyName);
LOG.warn("Expected checksum: {}, Actual checksum: {}",
kv.digest, curDigest);
}
}
is.close();
}
} catch (IOException ex) {
LOG.error("Exception while validating write.", ex);
Expand Down
Loading