Github user hmcl commented on a diff in the pull request: https://github.com/apache/storm/pull/1924#discussion_r99634404 --- Diff: external/storm-kafka-client/src/main/java/org/apache/storm/kafka/spout/KafkaSpoutRetryExponentialBackoff.java --- @@ -54,59 +56,92 @@ private static class RetryEntryTimeStampComparator implements Serializable, Comparator<RetrySchedule> { @Override public int compare(RetrySchedule entry1, RetrySchedule entry2) { - return Long.valueOf(entry1.nextRetryTimeNanos()).compareTo(entry2.nextRetryTimeNanos()); + int result = Long.valueOf(entry1.nextRetryTimeMs()).compareTo(entry2.nextRetryTimeMs()); + + if(result == 0) { + //TreeSet uses compareTo instead of equals() for the Set contract + //Ensure that we can save two retry schedules with the same timestamp + result = entry1.hashCode() - entry2.hashCode(); + } + return result; } } private class RetrySchedule { private final KafkaSpoutMessageId msgId; - private long nextRetryTimeNanos; + private long nextRetryTimeMs; public RetrySchedule(KafkaSpoutMessageId msgId, long nextRetryTime) { this.msgId = msgId; - this.nextRetryTimeNanos = nextRetryTime; + this.nextRetryTimeMs = nextRetryTime; LOG.debug("Created {}", this); } public void setNextRetryTime() { - nextRetryTimeNanos = nextTime(msgId); + nextRetryTimeMs = nextTime(msgId); LOG.debug("Updated {}", this); } - public boolean retry(long currentTimeNanos) { - return nextRetryTimeNanos <= currentTimeNanos; + public boolean retry(long currentTimeMs) { + return nextRetryTimeMs <= currentTimeMs; } @Override public String toString() { return "RetrySchedule{" + "msgId=" + msgId + - ", nextRetryTime=" + nextRetryTimeNanos + + ", nextRetryTimeMs=" + nextRetryTimeMs + '}'; } + @Override + public int hashCode() { --- End diff -- why did you decide to implement equals and hashcode ?
--- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastruct...@apache.org or file a JIRA ticket with INFRA. ---