smengcl commented on code in PR #11370:
URL: https://github.com/apache/ozone/pull/11370#discussion_r4311325151
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java:
##########
@@ -257,4 +266,72 @@ private DatanodeDetails randomDatanode() {
.build();
}
+ @Test
+ public void testDatanodeDetailsCacheUpdatesCurrentVersionChange() {
+ Cache<DatanodeID, DatanodeDetails> datanodeDetailsCache =
CacheBuilder.newBuilder().build();
+ DatanodeDetails original = randomDatanode();
+ original.setCurrentVersion(HDDSVersion.STREAM_BLOCK_SUPPORT);
+ DatanodeDetails upgraded = DatanodeDetails.newBuilder()
+ .setDatanodeDetails(original)
+ .setCurrentVersion(HDDSVersion.SHORT_CIRCUIT_READS)
+ .build();
+
+ ScmClient.newPipelineWithDNCache(createPipeline(1L,
asList(original)).getPipeline(), datanodeDetailsCache);
+ Pipeline refreshed = ScmClient.newPipelineWithDNCache(
+ createPipeline(2L, asList(upgraded)).getPipeline(),
datanodeDetailsCache);
+
+ assertSame(upgraded, refreshed.getNodes().get(0));
+ assertEquals(HDDSVersion.SHORT_CIRCUIT_READS,
refreshed.getNodes().get(0).getCurrentVersion());
+ assertSame(upgraded, datanodeDetailsCache.getIfPresent(original.getID()));
+ }
+
+ @Test
+ public void
testDatanodeDetailsCacheUpdatesKnownVersionToUnknownWireVersion() {
+ Cache<DatanodeID, DatanodeDetails> datanodeDetailsCache =
CacheBuilder.newBuilder().build();
+ DatanodeDetails original = randomDatanode();
+ original.setCurrentVersion(HDDSVersion.SHORT_CIRCUIT_READS);
+ DatanodeDetails upgraded = sameNodeWithWireVersion(original,
UNKNOWN_WIRE_VERSION_A);
+
+ ScmClient.newPipelineWithDNCache(
+ createPipeline(1L, asList(original)).getPipeline(),
datanodeDetailsCache);
+ Pipeline refreshed = ScmClient.newPipelineWithDNCache(
+ createPipeline(2L, asList(upgraded)).getPipeline(),
datanodeDetailsCache);
+
+ DatanodeDetails refreshedNode = refreshed.getNodes().get(0);
+ assertSame(upgraded, refreshedNode);
+ assertEquals(HDDSVersion.UNKNOWN_VERSION,
refreshedNode.getCurrentVersion());
+ assertEquals(UNKNOWN_WIRE_VERSION_A,
refreshedNode.getSerializedCurrentVersion());
+ assertSame(upgraded, datanodeDetailsCache.getIfPresent(original.getID()));
+ }
+
+ @Test
+ public void testDatanodeDetailsCacheUpdatesDifferentUnknownWireVersions() {
+ Cache<DatanodeID, DatanodeDetails> datanodeDetailsCache =
CacheBuilder.newBuilder().build();
+ DatanodeDetails original = sameNodeWithWireVersion(randomDatanode(),
UNKNOWN_WIRE_VERSION_A);
+ DatanodeDetails upgraded = sameNodeWithWireVersion(original,
UNKNOWN_WIRE_VERSION_B);
+
+ assertEquals(HDDSVersion.UNKNOWN_VERSION, original.getCurrentVersion());
+ assertEquals(HDDSVersion.UNKNOWN_VERSION, upgraded.getCurrentVersion());
+ assertNotSame(original.getSerializedCurrentVersion(),
upgraded.getSerializedCurrentVersion());
Review Comment:
nit
```suggestion
assertNotEquals(original.getSerializedCurrentVersion(),
upgraded.getSerializedCurrentVersion());
```
##########
hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestScmClient.java:
##########
@@ -257,4 +266,72 @@ private DatanodeDetails randomDatanode() {
.build();
}
+ @Test
+ public void testDatanodeDetailsCacheUpdatesCurrentVersionChange() {
+ Cache<DatanodeID, DatanodeDetails> datanodeDetailsCache =
CacheBuilder.newBuilder().build();
+ DatanodeDetails original = randomDatanode();
+ original.setCurrentVersion(HDDSVersion.STREAM_BLOCK_SUPPORT);
+ DatanodeDetails upgraded = DatanodeDetails.newBuilder()
+ .setDatanodeDetails(original)
+ .setCurrentVersion(HDDSVersion.SHORT_CIRCUIT_READS)
+ .build();
+
+ ScmClient.newPipelineWithDNCache(createPipeline(1L,
asList(original)).getPipeline(), datanodeDetailsCache);
+ Pipeline refreshed = ScmClient.newPipelineWithDNCache(
+ createPipeline(2L, asList(upgraded)).getPipeline(),
datanodeDetailsCache);
+
+ assertSame(upgraded, refreshed.getNodes().get(0));
+ assertEquals(HDDSVersion.SHORT_CIRCUIT_READS,
refreshed.getNodes().get(0).getCurrentVersion());
+ assertSame(upgraded, datanodeDetailsCache.getIfPresent(original.getID()));
+ }
+
+ @Test
+ public void
testDatanodeDetailsCacheUpdatesKnownVersionToUnknownWireVersion() {
Review Comment:
looks to me this dups `testDatanodeDetailsCacheUpdatesCurrentVersionChange`
thus can be dropped
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
