Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDDS-11309. Increase CONTAINER_STATE Column Length in UNHEALTHY_CONTAINERS to Avoid Truncation #7071

Merged
merged 5 commits into from
Aug 26, 2024
Merged

HDDS-11309. Increase CONTAINER_STATE Column Length in UNHEALTHY_CONTAINERS to Avoid Truncation #7071

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db0ef4a
HDDS-11309. Increase CONTAINER_STATE Column Length in UNHEALTHY_CONTA…
ArafatKhan2198 Aug 13, 2024
61dba70
Fixed a few styling issues
ArafatKhan2198 Aug 13, 2024
da0bb06
Reverted the length back to 16 and instead changed the name of the en…
ArafatKhan2198 Aug 14, 2024
6ee44c0
Improved the test method
ArafatKhan2198 Aug 20, 2024
5a0207d
Added a default case and also merged few cases together
ArafatKhan2198 Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../recon-codegen/src/main/java/org/hadoop/ozone/recon/schema/ContainerSchemaDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void initializeSchema() throws SQLException {
private void createUnhealthyContainersTable() {
dslContext.createTableIfNotExists(UNHEALTHY_CONTAINERS_TABLE_NAME)
.column(CONTAINER_ID, SQLDataType.BIGINT.nullable(false))
.column(CONTAINER_STATE, SQLDataType.VARCHAR(16).nullable(false))
.column(CONTAINER_STATE, SQLDataType.VARCHAR(40).nullable(false))
ArafatKhan2198 marked this conversation as resolved.
Show resolved Hide resolved
.column("in_state_since", SQLDataType.BIGINT.nullable(false))
.column("expected_replica_count", SQLDataType.INTEGER.nullable(false))
.column("actual_replica_count", SQLDataType.INTEGER.nullable(false))
Expand Down
50 changes: 50 additions & 0 deletions ...ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.hadoop.ozone.recon.schema.ContainerSchemaDefinition.UnHealthyContainerStates.ALL_REPLICAS_UNHEALTHY;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.anyInt;
Expand Down Expand Up @@ -384,6 +385,55 @@ public void testDeletedContainer() throws Exception {
.isGreaterThan(currentTime);
}

@Test
public void testAllContainerStateInsertions() {
// Set up DAOs and Schema Manager
UnhealthyContainersDao unHealthyContainersTableHandle =
getDao(UnhealthyContainersDao.class);

ContainerHealthSchemaManager containerHealthSchemaManager =
new ContainerHealthSchemaManager(
getSchemaDefinition(ContainerSchemaDefinition.class),
unHealthyContainersTableHandle);

// Iterate through each state in the UnHealthyContainerStates enum
for (ContainerSchemaDefinition.UnHealthyContainerStates state :
ContainerSchemaDefinition.UnHealthyContainerStates.values()) {
// Create a dummy UnhealthyContainer record with the current state
UnhealthyContainers unhealthyContainer = new UnhealthyContainers();
unhealthyContainer.setContainerId(state.ordinal() + 1L); // Ensure unique ID for each state
unhealthyContainer.setExpectedReplicaCount(3);
unhealthyContainer.setActualReplicaCount(1);
unhealthyContainer.setReplicaDelta(2);
unhealthyContainer.setContainerState(state.name());
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Though it will not impact test case purpose, but for each UnhealthyContainerState, expected replica count and actual replica count will differ. Currently what you have set in test is a Under replicated container , but in a loop setting container state same for all iterations.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pls fix this comment, as it creates confusion.

unhealthyContainer.setInStateSince(System.currentTimeMillis());

// Try inserting the record and catch any exception that occurs
Exception exception = null;
try {
containerHealthSchemaManager.insertUnhealthyContainerRecords(
Collections.singletonList(unhealthyContainer));
} catch (Exception e) {
exception = e;
}

// Assert no exception should be thrown for each state
assertNull(exception,
"Exception was thrown during insertion for state " + state.name() +
": " + exception);

// Optionally, verify the record was inserted correctly
List<UnhealthyContainers> insertedRecords =
unHealthyContainersTableHandle.fetchByContainerId(
state.ordinal() + 1L);
assertFalse(insertedRecords.isEmpty(),
"Record was not inserted for state " + state.name() + ".");
assertEquals(insertedRecords.get(0).getContainerState(), state.name(),
"The inserted container state does not match for state " +
state.name() + ".");
}
}

@Test
public void testNegativeSizeContainers() throws Exception {
// Setup mock objects and test environment
Expand Down