Skip to content

HDDS-1139 : Fix findbugs issues in HDDS-1085. #503

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

Closed
wants to merge 1 commit into from
Closed

HDDS-1139 : Fix findbugs issues in HDDS-1085. #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBCheckpointManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ public RocksDBCheckpointSnapshot createCheckpointSnapshot(String parentDir)
return null;
}

class RocksDBCheckpointSnapshot implements DBCheckpointSnapshot {
static class RocksDBCheckpointSnapshot implements DBCheckpointSnapshot {

private Path checkpointLocation;
private long checkpointTimestamp;
Expand Down
5 changes: 4 additions & 1 deletion hadoop-hdds/common/src/main/java/org/apache/hadoop/utils/db/RDBStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,10 @@ public RDBStore(File dbFile, DBOptions options, Set<TableConfig> families,
OM_DB_CHECKPOINTS_DIR_NAME).toString();
File checkpointsDir = new File(checkpointsParentDir);
if (!checkpointsDir.exists()) {
checkpointsDir.mkdir();
boolean success = checkpointsDir.mkdir();
if (!success) {
LOG.warn("Unable to create RocksDB checkpoint directory");
}
}

//Initialize checkpoint manager
Expand Down
13 changes: 9 additions & 4 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,8 +315,10 @@ public static File createTarFile(Path sourcePath) throws IOException {
tarOs = new TarArchiveOutputStream(gzipOutputStream);
File folder = new File(sourceDir);
File[] filesInDir = folder.listFiles();
for (File file : filesInDir) {
addFilesToArchive(file.getName(), file, tarOs);
if (filesInDir != null) {
for (File file : filesInDir) {
addFilesToArchive(file.getName(), file, tarOs);
}
}
return new File(fileName);
} finally {
Expand All @@ -343,8 +345,11 @@ private static void addFilesToArchive(String source, File file,
fileInputStream.close();
} else if (file.isDirectory()) {
tarFileOutputStream.closeArchiveEntry();
for (File cFile : file.listFiles()) {
addFilesToArchive(cFile.getAbsolutePath(), cFile, tarFileOutputStream);
File[] filesInDir = file.listFiles();
if (filesInDir != null) {
for (File cFile : filesInDir) {
addFilesToArchive(cFile.getAbsolutePath(), cFile, tarFileOutputStream);
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMDbSnapshotServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ public class OMDbSnapshotServlet extends HttpServlet {

private static final Logger LOG =
LoggerFactory.getLogger(OMDbSnapshotServlet.class);
private static final long serialVersionUID = 1L;

private transient DBStore omDbStore;
private DataTransferThrottler throttler = null;
private transient DataTransferThrottler throttler = null;

@Override
public void init() throws ServletException {
Expand Down Expand Up @@ -111,7 +112,6 @@ public void doGet(HttpServletRequest request, HttpServletResponse response) {
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
}
LOG.info("Tar location = " + checkPointTarFile.getAbsolutePath());
checkPointTarFile = OmUtils.createTarFile(
checkpoint.getCheckpointLocation());
LOG.info("Tar location = " + checkPointTarFile.getAbsolutePath());
Expand Down