Skip to content

Commit

Permalink
fix capitalization in variable name
Browse files Browse the repository at this point in the history
  • Loading branch information
ssalinas committed Feb 20, 2018
1 parent 20bdd4f commit 41577d3
Showing 1 changed file with 10 additions and 10 deletions.
Expand Up @@ -74,7 +74,7 @@ public class SingularityS3UploaderDriver extends WatchServiceHelper implements S
private final String hostname; private final String hostname;
private final SingularityRunnerExceptionNotifier exceptionNotifier; private final SingularityRunnerExceptionNotifier exceptionNotifier;


private final Map<S3UploadMetadata, SingularityUploader> metadataToimmediateUploader; private final Map<S3UploadMetadata, SingularityUploader> metadataToImmediateUploader;
private final Map<S3UploadMetadata, CompletableFuture<Integer>> immediateUploadersFutures; private final Map<S3UploadMetadata, CompletableFuture<Integer>> immediateUploadersFutures;


private ScheduledFuture<?> future; private ScheduledFuture<?> future;
Expand Down Expand Up @@ -109,7 +109,7 @@ public SingularityS3UploaderDriver(SingularityRunnerBaseConfiguration baseConfig
this.exceptionNotifier = exceptionNotifier; this.exceptionNotifier = exceptionNotifier;


this.immediateUploadersFutures = new ConcurrentHashMap<>(); this.immediateUploadersFutures = new ConcurrentHashMap<>();
this.metadataToimmediateUploader = new ConcurrentHashMap<>(); this.metadataToImmediateUploader = new ConcurrentHashMap<>();
} }


private void readInitialFiles() throws IOException { private void readInitialFiles() throws IOException {
Expand Down Expand Up @@ -208,7 +208,7 @@ public void shutdown() {
} }


private int checkUploads() { private int checkUploads() {
if (metadataToUploader.isEmpty() && metadataToimmediateUploader.isEmpty()) { if (metadataToUploader.isEmpty() && metadataToImmediateUploader.isEmpty()) {
return 0; return 0;
} }


Expand All @@ -218,7 +218,7 @@ private int checkUploads() {
List<S3UploadMetadata> toRetry = new ArrayList<>(); List<S3UploadMetadata> toRetry = new ArrayList<>();
List<S3UploadMetadata> toRemove = new ArrayList<>(); List<S3UploadMetadata> toRemove = new ArrayList<>();
for (Map.Entry<S3UploadMetadata, CompletableFuture<Integer>> entry : immediateUploadersFutures.entrySet()) { for (Map.Entry<S3UploadMetadata, CompletableFuture<Integer>> entry : immediateUploadersFutures.entrySet()) {
SingularityUploader uploader = metadataToimmediateUploader.get(entry.getKey()); SingularityUploader uploader = metadataToImmediateUploader.get(entry.getKey());
if (uploader == null) { if (uploader == null) {
toRemove.add(entry.getKey()); toRemove.add(entry.getKey());
continue; continue;
Expand All @@ -243,7 +243,7 @@ private int checkUploads() {


for (S3UploadMetadata uploaderMetadata : toRemove) { for (S3UploadMetadata uploaderMetadata : toRemove) {
metrics.getImmediateUploaderCounter().dec(); metrics.getImmediateUploaderCounter().dec();
SingularityUploader uploader = metadataToimmediateUploader.remove(uploaderMetadata); SingularityUploader uploader = metadataToImmediateUploader.remove(uploaderMetadata);
CompletableFuture<Integer> uploaderFuture = immediateUploadersFutures.remove(uploaderMetadata); CompletableFuture<Integer> uploaderFuture = immediateUploadersFutures.remove(uploaderMetadata);
if (uploaderFuture != null) { if (uploaderFuture != null) {
try { try {
Expand All @@ -269,7 +269,7 @@ private int checkUploads() {
} }


for (S3UploadMetadata uploaderMetadata : toRetry) { for (S3UploadMetadata uploaderMetadata : toRetry) {
SingularityUploader uploader = metadataToimmediateUploader.remove(uploaderMetadata); SingularityUploader uploader = metadataToImmediateUploader.remove(uploaderMetadata);
if (uploader != null) { if (uploader != null) {
LOG.debug("Retrying immediate uploader {}", uploaderMetadata); LOG.debug("Retrying immediate uploader {}", uploaderMetadata);
performImmediateUpload(uploader); performImmediateUpload(uploader);
Expand Down Expand Up @@ -419,7 +419,7 @@ private boolean handleNewOrModifiedS3Metadata(Path filename) throws IOException
final S3UploadMetadata metadata = maybeMetadata.get(); final S3UploadMetadata metadata = maybeMetadata.get();


SingularityUploader existingUploader = metadataToUploader.get(metadata); SingularityUploader existingUploader = metadataToUploader.get(metadata);
SingularityUploader existingImmediateUploader = metadataToimmediateUploader.get(metadata); SingularityUploader existingImmediateUploader = metadataToImmediateUploader.get(metadata);


if (metadata.isImmediate()) { if (metadata.isImmediate()) {
if (existingUploader != null) { if (existingUploader != null) {
Expand All @@ -428,7 +428,7 @@ private boolean handleNewOrModifiedS3Metadata(Path filename) throws IOException
if (existingImmediateUploader == null) { if (existingImmediateUploader == null) {
metrics.getUploaderCounter().dec(); metrics.getUploaderCounter().dec();
metrics.getImmediateUploaderCounter().inc(); metrics.getImmediateUploaderCounter().inc();
metadataToimmediateUploader.put(metadata, existingUploader); metadataToImmediateUploader.put(metadata, existingUploader);
metadataToUploader.remove(existingUploader.getUploadMetadata()); metadataToUploader.remove(existingUploader.getUploadMetadata());
uploaderLastHadFilesAt.remove(existingUploader); uploaderLastHadFilesAt.remove(existingUploader);
performImmediateUpload(existingUploader); performImmediateUpload(existingUploader);
Expand Down Expand Up @@ -484,7 +484,7 @@ private boolean handleNewOrModifiedS3Metadata(Path filename) throws IOException


if (metadata.isImmediate()) { if (metadata.isImmediate()) {
LOG.info("Created new immediate uploader {}", uploader); LOG.info("Created new immediate uploader {}", uploader);
metadataToimmediateUploader.put(metadata, uploader); metadataToImmediateUploader.put(metadata, uploader);
metrics.getImmediateUploaderCounter().inc(); metrics.getImmediateUploaderCounter().inc();
performImmediateUpload(uploader); performImmediateUpload(uploader);
return true; return true;
Expand Down Expand Up @@ -521,7 +521,7 @@ protected boolean processEvent(Kind<?> kind, final Path filename) throws IOExcep


if (kind.equals(StandardWatchEventKinds.ENTRY_DELETE)) { if (kind.equals(StandardWatchEventKinds.ENTRY_DELETE)) {
Optional<SingularityUploader> found = Iterables.tryFind(metadataToUploader.values(), input -> input != null && input.getMetadataPath().equals(fullPath)) Optional<SingularityUploader> found = Iterables.tryFind(metadataToUploader.values(), input -> input != null && input.getMetadataPath().equals(fullPath))
.or(Iterables.tryFind(metadataToimmediateUploader.values(), input -> input != null && input.getMetadataPath().equals(fullPath))); .or(Iterables.tryFind(metadataToImmediateUploader.values(), input -> input != null && input.getMetadataPath().equals(fullPath)));


LOG.trace("Found {} to match deleted path {}", found, filename); LOG.trace("Found {} to match deleted path {}", found, filename);


Expand Down

0 comments on commit 41577d3

Please sign in to comment.