-
Notifications
You must be signed in to change notification settings - Fork 16
4472 - Reduce duplication code for compactions and bulk export #5335
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.
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
4472 - Reduce duplication code for compactions and bulk export #5335
Conversation
…s and bulk export
…bulk-export-and-compaction-tasks
…bulk-export-and-compaction-tasks
…bulk-export-and-compaction-tasks
…bulk-export-and-compaction-tasks
…plication-between-starting-bulk-export-and-compaction-tasks
…plication-between-starting-bulk-export-and-compaction-tasks
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
…plication-between-starting-bulk-export-and-compaction-tasks
…plication-between-starting-bulk-export-and-compaction-tasks
…plication-between-starting-bulk-export-and-compaction-tasks
…plication-between-starting-bulk-export-and-compaction-tasks
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
…plication-between-starting-bulk-export-and-compaction-tasks
bb5b2f0 to
06d4e4e
Compare
…bulk-export-and-compaction-tasks
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
8c3ec27 to
e919608
Compare
patchwork01
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think the only important thing left is the argument count checks in the main methods. Other than that this looks great. Have you tested it in AWS, for bulk export & compaction?
java/common/common-task/src/main/java/sleeper/common/task/RunBulkExportTasks.java
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunCompactionTasks.java
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Outdated
Show resolved
Hide resolved
java/common/common-task/src/main/java/sleeper/common/task/RunDataProcessingTasks.java
Show resolved
Hide resolved
Haven't tested in AWS but happy to give that a go, might need some direction on doing that though |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good, thanks. I've left a couple more minor comments. It would be good to test it in AWS before we merge it.
For compaction there are some acceptance system tests that cover this:
- CompactionST
- CompactionOnEC2ST
We don't currently have a system test for bulk export, so you'd need to use the deployAll manual testing setup for that. You'll need to get some data into a table (which the deployAll setup does for you by default), and then trigger a bulk export by sending a message to the queue. Here's the documentation for that:
https://github.com/gchq/sleeper/blob/develop/docs/usage/export.md
Here's the documentation for those two types of system testing (acceptance tests vs manual testing):
https://github.com/gchq/sleeper/blob/develop/docs/development/system-tests.md
| return; | ||
| } | ||
| String instanceId = args[0]; | ||
| int numberOfTasks = Integer.parseInt(args[1]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's a bit easier to read with the arguments brought out like this, since you can compare it against the usage and count check just above here more directly. Can we keep this as it was before? The same applies to BulkExportTaskHostScaler.
java/common/common-task/src/main/java/sleeper/common/task/RunBulkExportTasks.java
Show resolved
Hide resolved
Okay I've now tested it on aws and the system tests ran fine along with a bulk export manual check. I think this is ready to merge now |
Issue
PR"
Tests
Documentation
separate issue for that below.