commit

Author: ankikuma

server/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java

@@ -191,8 +191,8 @@ protected Map<ShardId, BulkShardRequest> splitRequestOnPrimary(BulkShardRequest
         for (int i = 0; i < items.length; i++) {
             BulkItemRequest bulkItemRequest = items[i];
             DocWriteRequest<?> docWriteRequest = bulkItemRequest.request();
-            int shardId = docWriteRequest.rerouteAtSourceDuringResharding(routing);
-            // int shardId = docWriteRequest.route(routing);
+            // int shardId = docWriteRequest.rerouteAtSourceDuringResharding(routing);
+            int shardId = docWriteRequest.route(routing);
             // System.out.println("shardId = " + shardId);
             List<BulkItemRequest> shardRequests = requestsByShard.computeIfAbsent(
                 new ShardId(index, shardId),

server/src/main/java/org/elasticsearch/cluster/routing/IndexRouting.java

@@ -398,13 +398,17 @@ public int rerouteIndexingRequestIfResharding(
             BytesReference source
         ) {
             // System.out.println("Extract from source");
+            /*
             if (createTsidDuringRouting) {
                 assert tsid != null : "expecting a valid tsid";
                 hash = hash(tsid);
             } else {
                 // TODO: Is this always necessary ? This can be expensive. We should not do this on a transport thread I believe.
                 hash = hashRoutingFields(sourceType, source).buildHash(IndexRouting.ExtractFromSource::defaultOnEmpty);
             }
+
+             */
+            hash = hash(tsid);
             int shardId = hashToShardId(hash);
             return rerouteWritesIfResharding(shardId);
         }