Skip to content

Commit

Permalink
test
Browse files Browse the repository at this point in the history
  • Loading branch information
@crystall-bitquill
crystall-bitquill committed Feb 3, 2025
1 parent 8406f19 commit 9689832
Show file tree
Hide file tree
Showing 10 changed files with 201 additions and 165 deletions.
6 changes: 6 additions & 0 deletions common/lib/plugin_service.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ export class PluginService implements ErrorHandler, HostListProviderService {
}

private async setHostList(oldHosts: HostInfo[], newHosts: HostInfo[]) {
logger.silly("Setting host list");
console.log(oldHosts);
console.log(newHosts);
const oldHostMap: Map<string, HostInfo> = new Map(oldHosts.map((e) => [e.url, e]));
const newHostMap: Map<string, HostInfo> = new Map(newHosts.map((e) => [e.url, e]));

Expand All @@ -295,7 +298,10 @@ export class PluginService implements ErrorHandler, HostListProviderService {
}
});

console.log("changes: ");
console.log(changes);
if (changes.size > 0) {
logger.silly("Changes found, setting hosts");
this.hosts = newHosts ? newHosts : [];
await this.pluginServiceManagerContainer.pluginManager!.notifyHostListChanged(changes);
}
Expand Down
5 changes: 4 additions & 1 deletion common/lib/plugins/failover/failover_plugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,11 @@ export class FailoverPlugin extends AbstractConnectionPlugin {
throw new AwsWrapperError(Messages.get("Failover.unableToDetermineWriter"));
}

logger.silly("Failover writer complete, refreshing host list");
await this.pluginService.refreshHostList();
logger.silly(`Failover writer complete with writer host: ${writerHostInfo.host}`);
const allowedHosts = this.pluginService.getHosts();
console.log(allowedHosts);
if (!allowedHosts.some((hostInfo: HostInfo) => hostInfo.host === writerHostInfo?.host)) {
const failoverErrorMessage = Messages.get(
"Failover.newWriterNotAllowed",
Expand All @@ -430,7 +434,6 @@ export class FailoverPlugin extends AbstractConnectionPlugin {
await this.pluginService.abortCurrentClient();
await this.pluginService.setCurrentClient(result.client, writerHostInfo);
logger.debug(Messages.get("Failover.establishedConnection", this.pluginService.getCurrentHostInfo()?.host ?? ""));
await this.pluginService.refreshHostList();
this.throwFailoverSuccessError();
} catch (error: any) {
if (error instanceof FailoverSuccessError) {
Expand Down
6 changes: 3 additions & 3 deletions common/lib/plugins/failover2/failover2_plugin.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ export class Failover2Plugin extends AbstractConnectionPlugin implements CanRele
return (
this.enableFailoverSetting &&
this._rdsUrlType !== RdsUrlType.RDS_PROXY &&
this.pluginService.getHosts() &&
this.pluginService.getHosts().length > 0
this.pluginService.getAllHosts() &&
this.pluginService.getAllHosts().length > 0
);
}

Expand Down Expand Up @@ -382,7 +382,7 @@ export class Failover2Plugin extends AbstractConnectionPlugin implements CanRele
this.logAndThrowError(Messages.get("Failover2.unableToFetchTopology"));
}

const hosts: HostInfo[] = this.pluginService.getHosts();
const hosts: HostInfo[] = this.pluginService.getAllHosts();

let writerCandidateClient: ClientWrapper = null;
const writerCandidateHostInfo: HostInfo = hosts.find((x) => x.role === HostRole.WRITER);
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/container/tests/autoscaling.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { DriverHelper } from "./utils/driver_helper";
import { AuroraTestUtility } from "./utils/aurora_test_utility";
import { logger } from "../../../../common/logutils";
import { TestEnvironmentFeatures } from "./utils/test_environment_features";
import { features, instanceCount } from "./config";
import { features, instanceCount, runTests } from "./config";
import { InternalPooledConnectionProvider } from "../../../../common/lib/internal_pooled_connection_provider";
import { AwsPoolConfig } from "../../../../common/lib/aws_pool_config";
import { TestInstanceInfo } from "./utils/test_instance_info";
Expand All @@ -28,6 +28,7 @@ import { FailoverSuccessError } from "../../../../common/lib/utils/errors";
import { PluginManager } from "../../../../common/lib";

const itIf =
runTests &&
!features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) &&
instanceCount >= 2
Expand Down
6 changes: 4 additions & 2 deletions tests/integration/container/tests/basic_connectivity.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@ import { AuroraTestUtility } from "./utils/aurora_test_utility";
import { logger } from "../../../../common/logutils";
import { DatabaseEngine } from "./utils/database_engine";
import { TestEnvironmentFeatures } from "./utils/test_environment_features";
import { features } from "./config";
import { features, runTests } from "./config";
import { DatabaseEngineDeployment } from "./utils/database_engine_deployment";
import { PluginManager } from "../../../../common/lib";

const itIf =
!features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) ? it : it.skip;
runTests && !features.includes(TestEnvironmentFeatures.PERFORMANCE) && !features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY)
? it
: it.skip;

let client: any;
let auroraTestUtility: AuroraTestUtility;
Expand Down
1 change: 1 addition & 0 deletions tests/integration/container/tests/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ const testInfo = JSON.parse(infoJson);
const request = testInfo.request;
export const features = request.features;
export const instanceCount = request.numOfInstances;
export const runTests = false; // TODO: remove
113 changes: 64 additions & 49 deletions tests/integration/container/tests/custom_endpoint.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ let currentWriter: string;

let auroraTestUtility: AuroraTestUtility;

async function initDefaultConfig(host: string, port: number, connectToProxy: boolean, failoverMode: string): Promise<any> {
async function initDefaultConfig(host: string, port: number, connectToProxy: boolean, failoverMode: string, usingFailover1: boolean): Promise<any> {
let config: any = {
user: env.databaseInfo.username,
host: host,
Expand All @@ -76,6 +76,11 @@ async function initDefaultConfig(host: string, port: number, connectToProxy: boo
telemetryTracesBackend: "OTLP",
telemetryMetricsBackend: "OTLP"
};
if (usingFailover1) {
config["plugins"] = "customEndpoint,readWriteSplitting,failover";
} else {
config["plugins"] = "customEndpoint,readWriteSplitting,failover2";
}
if (connectToProxy) {
config["clusterInstanceHostPattern"] = "?." + env.proxyDatabaseInfo.instanceEndpointSuffix;
}
Expand Down Expand Up @@ -216,14 +221,17 @@ describe("custom endpoint", () => {
instance2 = instances[1].instanceId;
await createEndpoint(clusterId, instances.slice(0, 1), endpointId1, "ANY");
await createEndpoint(clusterId, instances.slice(0, 2), endpointId2, "ANY");
await createEndpoint(env.auroraClusterName, env.instances.slice(0, 2), endpointId3, "READER");
endpointInfo1 = await waitUntilEndpointAvailable(endpointId1);
endpointInfo2 = await waitUntilEndpointAvailable(endpointId2);
endpointInfo3 = await waitUntilEndpointAvailable(endpointId3);
}, 1000000);

afterAll(async () => {
try {
await deleteEndpoint(rdsClient, endpointId1);
await deleteEndpoint(rdsClient, endpointId2);
await deleteEndpoint(rdsClient, endpointId3);
} finally {
rdsClient.destroy();
}
Expand All @@ -246,10 +254,50 @@ describe("custom endpoint", () => {
await PluginManager.releaseResources();
});

itIf(
itIf.each([true, false])(
"test custom endpoint failover - strict reader",
async (usingFailover1: boolean) => {
const config = await initDefaultConfig(endpointInfo3.Endpoint, env.databaseInfo.instanceEndpointPort, false, "strict-reader", usingFailover1);
client = initClientFunc(config);

await client.connect();

const endpointMembers = endpointInfo3.StaticMembers;
const instanceId = await auroraTestUtility.queryInstanceId(client);
expect(endpointMembers.includes(instanceId)).toBeTruthy();
expect(instanceId).not.toBe(currentWriter);

// Use failover API to break connection.
await auroraTestUtility.failoverClusterAndWaitUntilWriterChanged(
currentWriter,
env.info.auroraClusterName,
instanceId === instance1 ? instance1 : instance2
);

await expect(auroraTestUtility.queryInstanceId(client)).rejects.toThrow(FailoverSuccessError);

endpointInfo3 = await waitUntilEndpointAvailable(endpointId3);
const newEndpointMembers = endpointInfo3.StaticMembers;

const newInstanceId: string = await auroraTestUtility.queryInstanceId(client);
expect(newEndpointMembers.includes(newInstanceId)).toBeTruthy();

const newWriter = await auroraTestUtility.getClusterWriterInstanceId(env.info.auroraClusterName);
expect(newInstanceId).not.toBe(newWriter);
},
1000000
);

itIf.each([true, false])(
"test custom endpoint read write splitting with custom endpoint changes",
async () => {
const config = await initDefaultConfig(endpointInfo1.Endpoint, env.databaseInfo.instanceEndpointPort, false, "reader-or-writer");
async (usingFailover1: boolean) => {
const config = await initDefaultConfig(
endpointInfo1.Endpoint,
env.databaseInfo.instanceEndpointPort,
false,
"reader-or-writer",
usingFailover1
);
// This setting is not required for the test, but it allows us to also test re-creation of expired monitors since it
// takes more than 30 seconds to modify the cluster endpoint (usually around 140s).
config.customEndpointMonitorExpirationMs = 30000;
Expand Down Expand Up @@ -323,49 +371,10 @@ describe("custom endpoint", () => {
1000000
);

itIf(
"test custom endpoint failover - strict reader",
async () => {
await createEndpoint(env.auroraClusterName, env.instances.slice(0, 2), endpointId3, "READER");
endpointInfo3 = await waitUntilEndpointAvailable(endpointId3);

const config = await initDefaultConfig(endpointInfo3.Endpoint, env.databaseInfo.instanceEndpointPort, false, "strict-reader");
client = initClientFunc(config);

await client.connect();

const endpointMembers = endpointInfo3.StaticMembers;
const instanceId = await auroraTestUtility.queryInstanceId(client);
expect(endpointMembers.includes(instanceId)).toBeTruthy();
expect(instanceId).not.toBe(currentWriter);

// Use failover API to break connection.
await auroraTestUtility.failoverClusterAndWaitUntilWriterChanged(
currentWriter,
env.info.auroraClusterName,
instanceId === instance1 ? instance1 : instance2
);

await expect(auroraTestUtility.queryInstanceId(client)).rejects.toThrow(FailoverSuccessError);

endpointInfo3 = await waitUntilEndpointAvailable(endpointId3);
const newEndpointMembers = endpointInfo3.StaticMembers;

const newInstanceId: string = await auroraTestUtility.queryInstanceId(client);
expect(newEndpointMembers.includes(newInstanceId)).toBeTruthy();

const newWriter = await auroraTestUtility.getClusterWriterInstanceId(env.info.auroraClusterName);
expect(newInstanceId).not.toBe(newWriter);

await deleteEndpoint(rdsClient, endpointId3);
},
1000000
);

itIf(
itIf.each([true, false])(
"test custom endpoint failover - strict writer",
async () => {
const config = await initDefaultConfig(endpointInfo2.Endpoint, env.databaseInfo.instanceEndpointPort, false, "strict-writer");
async (usingFailvoer1: boolean) => {
const config = await initDefaultConfig(endpointInfo2.Endpoint, env.databaseInfo.instanceEndpointPort, false, "strict-writer", usingFailvoer1);
client = initClientFunc(config);

await client.connect();
Expand Down Expand Up @@ -399,10 +408,16 @@ describe("custom endpoint", () => {
1000000
);

itIf(
itIf.each([true, false])(
"test custom endpoint failover - reader or writer mode",
async () => {
const config = await initDefaultConfig(endpointInfo1.Endpoint, env.databaseInfo.instanceEndpointPort, false, "reader-or-writer");
async (usingFailover1: boolean) => {
const config = await initDefaultConfig(
endpointInfo1.Endpoint,
env.databaseInfo.instanceEndpointPort,
false,
"reader-or-writer",
usingFailover1
);
client = initClientFunc(config);

await client.connect();
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/container/tests/iam_authentication.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,12 @@ import { AwsMySQLClient } from "../../../../mysql/lib";
import { IamAuthenticationPlugin } from "../../../../common/lib/authentication/iam_authentication_plugin";
import { logger } from "../../../../common/logutils";
import { TestEnvironmentFeatures } from "./utils/test_environment_features";
import { features } from "./config";
import { features, runTests } from "./config";
import { PluginManager } from "../../../../common/lib";
import { jest } from "@jest/globals";

const itIf =
runTests &&
!features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
!features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) &&
features.includes(TestEnvironmentFeatures.IAM)
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/container/tests/read_write_splitting.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ import { QueryResult } from "pg";
import { ProxyHelper } from "./utils/proxy_helper";
import { logger } from "../../../../common/logutils";
import { TestEnvironmentFeatures } from "./utils/test_environment_features";
import { features, instanceCount } from "./config";
import { features, instanceCount, runTests } from "./config";
import { InternalPooledConnectionProvider } from "../../../../common/lib/internal_pooled_connection_provider";
import { AwsPoolConfig } from "../../../../common/lib/aws_pool_config";
import { InternalPoolMapping } from "../../../../common/lib/utils/internal_pool_mapping";
import { HostInfo } from "../../../../common/lib/host_info";
import { PluginManager } from "../../../../common/lib";

const itIf =
runTests &&
!features.includes(TestEnvironmentFeatures.PERFORMANCE) &&
features.includes(TestEnvironmentFeatures.IAM) &&
!features.includes(TestEnvironmentFeatures.RUN_AUTOSCALING_TESTS_ONLY) &&
Expand Down
Loading

0 comments on commit 9689832

Please sign in to comment.