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

Fix rule file test #160

Merged
merged 1 commit into from
Jan 12, 2024
Merged

Fix rule file test #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 3 additions & 16 deletions gateway-ha/src/test/java/io/trino/gateway/ha/router/TestRoutingGroupSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,22 @@
import org.junit.jupiter.api.TestInstance.Lifecycle;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.FileWriter;
import java.util.stream.Stream;

import static io.trino.gateway.ha.router.RoutingGroupSelector.ROUTING_GROUP_HEADER;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;

@TestInstance(Lifecycle.PER_CLASS)
public class TestRoutingGroupSelector
{
private static final Logger log = LoggerFactory.getLogger(TestRoutingGroupSelector.class);
public static final String TRINO_SOURCE_HEADER = "X-Trino-Source";
public static final String TRINO_CLIENT_TAGS_HEADER = "X-Trino-Client-Tags";

Expand Down Expand Up @@ -111,7 +108,6 @@ void testByRoutingRulesEngineNoMatch(String rulesConfigPath)
assertNull(routingGroupSelector.findRoutingGroup(mockRequest));
}

//Todo: The functionality of reading the file before every request needs to be smarter
@Test
public void testByRoutingRulesEngineFileChange()
throws Exception
Expand All @@ -127,9 +123,7 @@ public void testByRoutingRulesEngineFileChange()
+ "actions:\n"
+ " - \"result.put(\\\"routingGroup\\\", \\\"etl\\\")\"");
fw.close();
file.getPath();
long etlLastModified = file.lastModified();
log.info("etl rule file created at: " + etlLastModified);
long lastModifed = file.lastModified();

RoutingGroupSelector routingGroupSelector =
RoutingGroupSelector.byRoutingRulesEngine(file.getPath());
Expand All @@ -140,11 +134,6 @@ public void testByRoutingRulesEngineFileChange()
assertEquals("etl",
routingGroupSelector.findRoutingGroup(mockRequest));

Thread.sleep(1);
// java.nio.file.attribute.FileTime offers a maximum precision of 1 ms. If the first
// half of this test runs in <1ms, the gateway may not recognize that the file
// has changed.

fw = new FileWriter(file, UTF_8);
fw.write(
"---\n"
Expand All @@ -154,9 +143,7 @@ public void testByRoutingRulesEngineFileChange()
+ "actions:\n"
+ " - \"result.put(\\\"routingGroup\\\", \\\"etl2\\\")\""); // change from etl to etl2
fw.close();
long etl2LastModified = file.lastModified();
log.info("etl2 rule file created at: " + etl2LastModified);
assertNotEquals(etl2LastModified, etlLastModified);
assertThat(file.setLastModified(lastModifed + 1000)).isTrue();

when(mockRequest.getHeader(TRINO_SOURCE_HEADER)).thenReturn("airflow");
assertEquals("etl2",
Expand Down