#137 - Handle sticky session expiration #162
Conversation
|
|
||
| if (channelEvents.get(resp.getAckId()) != null) { | ||
| log.error("ackId={} already exists for channel={} index={}", resp.getAckId(), channel, channel.getIndexer()); | ||
| log.warn("ackId={} already exists for channel={} index={}, possible duplication of data", resp.getAckId(), channel, channel.getIndexer()); |
There was a problem hiding this comment.
Modify to
log.warn("ackId={} already exists for channel={} index={} data may be duplicated in Splunk", resp.getAckId(), channel, channel.getIndexer());
| return ackPollInterval; | ||
| } | ||
|
|
||
| public void stickySessionHandler(HecChannel channel) { |
There was a problem hiding this comment.
Include JavaDocs for new method
/**
* StickySessionHandler is .... It is used to ..
*
* @param channel "channel is ...
* @see HecChannel
* @since 1.1.0
*/
| ConcurrentHashMap<Long, EventBatch> channelBatches = outstandingEventBatches.get(channel); | ||
| // Remove batches for the channel from the poller | ||
| if(channelBatches != null && channelBatches.size() > 0) { | ||
| totalOutstandingEventBatches.addAndGet(-channelBatches.size()); |
There was a problem hiding this comment.
Possibly use getAndDecrement() after each batch.fail instead of larger subtraction of totalOutstandingEventBatches to ensure correctness in value at all times.
| batch.fail(); | ||
| expired.add(batch); | ||
| iter.remove(); | ||
| } |
There was a problem hiding this comment.
include log lines indicated - Found x batches marked for failure
- Sucessfully failed x batches
| if(resp.equals("sticky_session_expired")) { | ||
| stickySessionHandler(channel); | ||
| } else { | ||
| try { |
There was a problem hiding this comment.
don't need to nest the try catch. move it out to capture
String resp = channel.executeHttpRequest(request);
and
stickySessionHandler(channel);
|
|
||
| public void setId() { id = newChannelId(); } | ||
|
|
||
| public void setAvailable(boolean _isAvailable) { isAvailable = _isAvailable; } |
There was a problem hiding this comment.
change to
public void setAvailable(boolean isAvailable) { this.isAvailable = isAvailable; }
| log.debug("sent {} events to splunk through channel={} indexer={}", | ||
| batch.size(), channel.getId(), getBaseUrl()); | ||
| } | ||
|
|
dtregonning
left a comment
dtregonning
left a comment
There was a problem hiding this comment.
Thanks for PR Chaitanya.
Please address comments in review and validate duplicate testing for current release and PR are equal or better.
chaitanyaphalak
force-pushed
the
channel-expiration-logging
branch
4 times, most recently
from
cbf4c56 to
17adf42
Compare
| } else if (resp.equals(noDataError)) { | ||
| return createResponse(resp, 400); | ||
| } else { | ||
| } else { |
| } | ||
|
|
||
| // log.info("event posting, channel={}, cookies={}", channel, resp.getHeaders("Set-Cookie")); | ||
| // log.info("event posting, channel={}, cookies={}, cookies.length={}", channel, resp.getHeaders("Set-Cookie"), resp.getHeaders("Set-Cookie").length); |
| // Set channel unavailable | ||
| channel.setAvailable(false); | ||
| log.info("Channel {} set to be not available", oldChannelId); | ||
| // Get batches for the channel |
There was a problem hiding this comment.
move single line comments to "flow description" in java docs
| return; | ||
| } | ||
| handleAckPollResult(channel, ackPollResult); | ||
| if (ackPollResult != null) { |
There was a problem hiding this comment.
look for more graceful way of handling null response. use exception handling or remove if not needed
chaitanyaphalak
force-pushed
the
channel-expiration-logging
branch
from
17adf42 to
33306e8
Compare
dtregonning
left a comment
dtregonning
left a comment
There was a problem hiding this comment.
Thanks for PR - all work looks good.
2 participants
No description provided.