Skip to content

Commit abace70

Browse files
arp7elek
authored andcommitted
HDDS-1420. Tracing exception in DataNode HddsDispatcher
Closes #723
1 parent 75ba719 commit abace70

File tree

5 files changed

+0
-18
lines changed

5 files changed

+0
-18
lines changed

hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/CloseContainerCommandHandler.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.slf4j.LoggerFactory;
4040

4141
import java.io.IOException;
42-
import java.util.UUID;
4342

4443
/**
4544
* Handler for close container command received from SCM.
@@ -138,7 +137,6 @@ private ContainerCommandRequestProto getContainerCommandRequestProto(
138137
command.setContainerID(containerId);
139138
command.setCloseContainer(
140139
ContainerProtos.CloseContainerRequestProto.getDefaultInstance());
141-
command.setTraceID(UUID.randomUUID().toString());
142140
command.setDatanodeUuid(datanodeDetails.getUuidString());
143141
return command.build();
144142
}

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestHddsDispatcher.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,6 @@ private ContainerCommandRequestProto getWriteChunkRequest(
266266
.newBuilder()
267267
.setContainerID(containerId)
268268
.setCmdType(ContainerProtos.Type.WriteChunk)
269-
.setTraceID(UUID.randomUUID().toString())
270269
.setDatanodeUuid(datanodeId)
271270
.setWriteChunk(writeChunkRequest)
272271
.build();

hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/statemachine/commandhandler/TestCloseContainerCommandHandler.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,6 @@ private Container createContainer(final Configuration conf,
305305
request.setContainerID(containerId.getId());
306306
request.setCreateContainer(
307307
ContainerProtos.CreateContainerRequestProto.getDefaultInstance());
308-
request.setTraceID(UUID.randomUUID().toString());
309308
request.setDatanodeUuid(datanodeDetails.getUuidString());
310309
ozoneContainer.getWriteChannel().submitRequest(
311310
request.build(), pipelineID.getProtobuf());

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestContainerStateMachineFailures.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import java.io.IOException;
4444
import java.util.HashMap;
4545
import java.util.List;
46-
import java.util.UUID;
4746
import java.util.concurrent.TimeUnit;
4847

4948
import static org.apache.hadoop.hdds.HddsConfigKeys.
@@ -181,7 +180,6 @@ public void testContainerStateMachineFailures() throws Exception {
181180
request.setContainerID(containerID);
182181
request.setCreateContainer(
183182
ContainerProtos.CreateContainerRequestProto.getDefaultInstance());
184-
request.setTraceID(UUID.randomUUID().toString());
185183
request.setDatanodeUuid(
186184
cluster.getHddsDatanodes().get(0).getDatanodeDetails().getUuidString());
187185
Assert.assertEquals(ContainerProtos.Result.CONTAINER_MISSING,

hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ContainerTestHelper.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ public static ContainerCommandRequestProto getWriteChunkRequest(
239239
request.setCmdType(ContainerProtos.Type.WriteChunk);
240240
request.setContainerID(blockID.getContainerID());
241241
request.setWriteChunk(writeRequest);
242-
request.setTraceID(UUID.randomUUID().toString());
243242
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
244243

245244
return request.build();
@@ -281,7 +280,6 @@ public static ContainerCommandRequestProto getWriteSmallFileRequest(
281280
request.setCmdType(ContainerProtos.Type.PutSmallFile);
282281
request.setContainerID(blockID.getContainerID());
283282
request.setPutSmallFile(smallFileRequest);
284-
request.setTraceID(UUID.randomUUID().toString());
285283
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
286284
return request.build();
287285
}
@@ -300,7 +298,6 @@ public static ContainerCommandRequestProto getReadSmallFileRequest(
300298
request.setCmdType(ContainerProtos.Type.GetSmallFile);
301299
request.setContainerID(getKey.getGetBlock().getBlockID().getContainerID());
302300
request.setGetSmallFile(smallFileRequest);
303-
request.setTraceID(UUID.randomUUID().toString());
304301
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
305302
return request.build();
306303
}
@@ -330,7 +327,6 @@ public static ContainerCommandRequestProto getReadChunkRequest(
330327
newRequest.setCmdType(ContainerProtos.Type.ReadChunk);
331328
newRequest.setContainerID(readRequest.getBlockID().getContainerID());
332329
newRequest.setReadChunk(readRequest);
333-
newRequest.setTraceID(UUID.randomUUID().toString());
334330
newRequest.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
335331
return newRequest.build();
336332
}
@@ -363,7 +359,6 @@ public static ContainerCommandRequestProto getDeleteChunkRequest(
363359
request.setCmdType(ContainerProtos.Type.DeleteChunk);
364360
request.setContainerID(writeRequest.getBlockID().getContainerID());
365361
request.setDeleteChunk(deleteRequest);
366-
request.setTraceID(UUID.randomUUID().toString());
367362
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
368363
return request.build();
369364
}
@@ -402,7 +397,6 @@ private static Builder getContainerCommandRequestBuilder(long containerID,
402397
request.setContainerID(containerID);
403398
request.setCreateContainer(
404399
ContainerProtos.CreateContainerRequestProto.getDefaultInstance());
405-
request.setTraceID(UUID.randomUUID().toString());
406400
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
407401

408402
return request;
@@ -455,7 +449,6 @@ public static ContainerCommandRequestProto getUpdateContainerRequest(
455449
request.setCmdType(ContainerProtos.Type.UpdateContainer);
456450
request.setContainerID(containerID);
457451
request.setUpdateContainer(updateRequestBuilder.build());
458-
request.setTraceID(UUID.randomUUID().toString());
459452
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
460453
return request.build();
461454
}
@@ -506,7 +499,6 @@ public static ContainerCommandRequestProto getPutBlockRequest(
506499
request.setCmdType(ContainerProtos.Type.PutBlock);
507500
request.setContainerID(blockData.getContainerID());
508501
request.setPutBlock(putRequest);
509-
request.setTraceID(UUID.randomUUID().toString());
510502
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
511503
return request.build();
512504
}
@@ -534,7 +526,6 @@ public static ContainerCommandRequestProto getBlockRequest(
534526
request.setCmdType(ContainerProtos.Type.GetBlock);
535527
request.setContainerID(blockID.getContainerID());
536528
request.setGetBlock(getRequest);
537-
request.setTraceID(UUID.randomUUID().toString());
538529
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
539530
return request.build();
540531
}
@@ -571,7 +562,6 @@ public static ContainerCommandRequestProto getDeleteBlockRequest(
571562
request.setCmdType(ContainerProtos.Type.DeleteBlock);
572563
request.setContainerID(blockID.getContainerID());
573564
request.setDeleteBlock(delRequest);
574-
request.setTraceID(UUID.randomUUID().toString());
575565
request.setDatanodeUuid(pipeline.getFirstNode().getUuidString());
576566
return request.build();
577567
}
@@ -590,7 +580,6 @@ public static ContainerCommandRequestProto getCloseContainer(
590580
.setContainerID(containerID)
591581
.setCloseContainer(
592582
ContainerProtos.CloseContainerRequestProto.getDefaultInstance())
593-
.setTraceID(UUID.randomUUID().toString())
594583
.setDatanodeUuid(pipeline.getFirstNode().getUuidString())
595584
.build();
596585

@@ -635,7 +624,6 @@ public static ContainerCommandRequestProto getDeleteContainer(
635624
.setDeleteContainer(
636625
ContainerProtos.DeleteContainerRequestProto.getDefaultInstance())
637626
.setDeleteContainer(deleteRequest)
638-
.setTraceID(UUID.randomUUID().toString())
639627
.setDatanodeUuid(pipeline.getFirstNode().getUuidString())
640628
.build();
641629
}

0 commit comments

Comments
 (0)