ElasticSearch Client: Wrapping of InterruptedException without restoring interrupted state of thread

[stefanocke]

Elasticsearch version: 7.6.2

Here, java.lang.InterruptedException is catched and wrapped without restoring the interrupt state (i.e. calling Thread.currentThread().interrupt()).

https://github.com/elastic/elasticsearch/blob/master/client/rest/src/main/java/org/elasticsearch/client/RestClient.java#L842

private static Exception extractAndWrapCause(Exception exception) {
        if (exception instanceof InterruptedException) {
            throw new RuntimeException("thread waiting for the response was interrupted", exception);
        }

This is bad practice, since subsequent code might miss the fact that the thread is interrupted.

Similar issues have been submitted for other places before. See for example #4712

[elasticmachine]

Pinging @elastic/es-core-features (Team:Core/Features)

[AlbusAndreus]

maybe try creating an instance boolean that is turned off when the exception is caught and the code that follows it can check if the boolean is true before executing certain code.

[stefanocke]

@AlbusAndreus , please see for example here for best practices:
https://www.ibm.com/developerworks/library/j-jtp05236/index.html

And there, especially the section "Don't swallow interrupts"

Basically you are right, but the boolean you are talking about must be Thread.isInterrupted().