Don't relocate scroll contexts

Author: cbuescher

server/src/main/java/org/elasticsearch/search/SearchService.java

@@ -1245,9 +1245,9 @@ private ReaderContext findReaderContext(ShardSearchContextId id, TransportReques
         if (id.getSessionId().isEmpty()) {
             throw new IllegalArgumentException("Session id must be specified");
         }
-        // if (sessionId.equals(id.getSessionId()) == false) {
-        // throw new SearchContextMissingException(id);
-        // }
+//         if (sessionId.equals(id.getSessionId()) == false) {
+//            throw new SearchContextMissingException(id);
+//         }
         final ReaderContext reader = activeReaders.get(id.readerContextId());
         if (reader == null) {
             throw new SearchContextMissingException(id);
@@ -1850,6 +1850,7 @@ public List<ReaderContext> getActiveContexts(ShardId shardId) {
         return this.activeReaders.values()
             .stream()
             .filter(c -> c.singleSession() == false)
+            .filter(c -> c.scrollContext() == null)
             .filter(c -> c.indexShard().shardId().equals(shardId))
             .collect(Collectors.toList());
     }