Skip to content

HDDS-5353. Avoid unnecessary executeBatch call in insertAudits #2342

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
adoroszlai merged 3 commits into from
Jun 23, 2021
Merged

HDDS-5353. Avoid unnecessary executeBatch call in insertAudits #2342

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e78ad9
HDDS-5353. Fix execute twice of executeBatch when insertAudits
Jun 16, 2021
5a4cf42
Retrigger for CI
Jun 18, 2021
b56e96c
trigger new CI check
adoroszlai Jun 23, 2021
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
7 changes: 4 additions & 3 deletions ...ozone/tools/src/main/java/org/apache/hadoop/ozone/audit/parser/common/DatabaseHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ private static void loadProperties() {
throw new FileNotFoundException("property file '"
+ ParserConsts.PROPS_FILE + "' not found in the classpath");
}
} catch(Exception e){
} catch (Exception e){
LOG.error(e.getMessage());
}

Expand Down Expand Up @@ -124,8 +124,9 @@ private static boolean insertAudits(String dbName, String logs)
preparedStatement.executeBatch();
}
}
if (!auditEntries.isEmpty()) {
preparedStatement.executeBatch(); // insert remaining records
if (auditEntries.size() % batchSize != 0) {
// insert remaining records
preparedStatement.executeBatch();
}
}
return true;
Expand Down