grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1947 from murgatroid99/grpc-js-xds_nack_semantics 

grpc-js-xds: Use valid resources when NACKing messages
This commit is contained in:
Michael Lumish 2021-10-25 14:25:07 -07:00 committed by GitHub
parent 356f93728d 2a45b343d5
commit 7c9ded05e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/grpc-js-xds/src/xds-stream-state/cds-state.ts
View File

@ -137,17 +137,21 @@ export class CdsState implements XdsStreamState<Cluster__Output> {
}
handleResponses(responses: Cluster__Output[], isV2: boolean): string | null {
const validResponses: Cluster__Output[] = [];
let errorMessage: string | null = null;
for (const message of responses) {
if (!this.validateResponse(message)) {
if (this.validateResponse(message)) {
validResponses.push(message);
} else {
trace('CDS validation failed for message ' + JSON.stringify(message));
return 'CDS Error: Cluster validation failed';
errorMessage = 'CDS Error: Cluster validation failed';
}
}
this.latestResponses = responses;
this.latestResponses = validResponses;
this.latestIsV2 = isV2;
const allEdsServiceNames: Set<string> = new Set<string>();
const allClusterNames: Set<string> = new Set<string>();
for (const message of responses) {
for (const message of validResponses) {
allClusterNames.add(message.name);
const edsServiceName = message.eds_cluster_config?.service_name ?? '';
allEdsServiceNames.add(
@ -161,7 +165,7 @@ export class CdsState implements XdsStreamState<Cluster__Output> {
trace('Received CDS updates for cluster names ' + Array.from(allClusterNames));
this.handleMissingNames(allClusterNames);
this.edsState.handleMissingNames(allEdsServiceNames);
return null;
return errorMessage;
}
reportStreamError(status: StatusObject): void {

14
packages/grpc-js-xds/src/xds-stream-state/eds-state.ts
View File

@ -146,16 +146,20 @@ export class EdsState implements XdsStreamState<ClusterLoadAssignment__Output> {
}
handleResponses(responses: ClusterLoadAssignment__Output[], isV2: boolean) {
const validResponses: ClusterLoadAssignment__Output[] = [];
let errorMessage: string | null = null;
for (const message of responses) {
if (!this.validateResponse(message)) {
if (this.validateResponse(message)) {
validResponses.push(message);
} else {
trace('EDS validation failed for message ' + JSON.stringify(message));
return 'EDS Error: ClusterLoadAssignment validation failed';
errorMessage = 'EDS Error: ClusterLoadAssignment validation failed';
}
}
this.latestResponses = responses;
this.latestResponses = validResponses;
this.latestIsV2 = isV2;
const allClusterNames: Set<string> = new Set<string>();
for (const message of responses) {
for (const message of validResponses) {
allClusterNames.add(message.cluster_name);
const watchers = this.watchers.get(message.cluster_name) ?? [];
for (const watcher of watchers) {
@ -163,7 +167,7 @@ export class EdsState implements XdsStreamState<ClusterLoadAssignment__Output> {
}
}
trace('Received EDS updates for cluster names ' + Array.from(allClusterNames));
return null;
return errorMessage;
}
reportStreamError(status: StatusObject): void {

14
packages/grpc-js-xds/src/xds-stream-state/lds-state.ts
View File

@ -154,17 +154,21 @@ export class LdsState implements XdsStreamState<Listener__Output> {
}
handleResponses(responses: Listener__Output[], isV2: boolean): string | null {
const validResponses: Listener__Output[] = [];
let errorMessage: string | null = null;
for (const message of responses) {
if (!this.validateResponse(message, isV2)) {
if (this.validateResponse(message, isV2)) {
validResponses.push(message);
} else {
trace('LDS validation failed for message ' + JSON.stringify(message));
return 'LDS Error: Route validation failed';
errorMessage = 'LDS Error: Route validation failed';
}
}
this.latestResponses = responses;
this.latestResponses = validResponses;
this.latestIsV2 = isV2;
const allTargetNames = new Set<string>();
const allRouteConfigNames = new Set<string>();
for (const message of responses) {
for (const message of validResponses) {
allTargetNames.add(message.name);
const httpConnectionManager = decodeSingleResource(HTTP_CONNECTION_MANGER_TYPE_URL_V3, message.api_listener!.api_listener!.value);
if (httpConnectionManager.rds) {
@ -178,7 +182,7 @@ export class LdsState implements XdsStreamState<Listener__Output> {
trace('Received RDS response with route config names ' + Array.from(allTargetNames));
this.handleMissingNames(allTargetNames);
this.rdsState.handleMissingNames(allRouteConfigNames);
return null;
return errorMessage;
}
reportStreamError(status: StatusObject): void {

14
packages/grpc-js-xds/src/xds-stream-state/rds-state.ts
View File

@ -183,16 +183,20 @@ export class RdsState implements XdsStreamState<RouteConfiguration__Output> {
}
handleResponses(responses: RouteConfiguration__Output[], isV2: boolean): string | null {
const validResponses: RouteConfiguration__Output[] = [];
let errorMessage: string | null = null;
for (const message of responses) {
if (!this.validateResponse(message, isV2)) {
if (this.validateResponse(message, isV2)) {
validResponses.push(message);
} else {
trace('RDS validation failed for message ' + JSON.stringify(message));
return 'RDS Error: Route validation failed';
errorMessage = 'RDS Error: Route validation failed';
}
}
this.latestResponses = responses;
this.latestResponses = validResponses;
this.latestIsV2 = isV2;
const allRouteConfigNames = new Set<string>();
for (const message of responses) {
for (const message of validResponses) {
allRouteConfigNames.add(message.name);
const watchers = this.watchers.get(message.name) ?? [];
for (const watcher of watchers) {
@ -200,7 +204,7 @@ export class RdsState implements XdsStreamState<RouteConfiguration__Output> {
}
}
trace('Received RDS response with route config names ' + Array.from(allRouteConfigNames));
return null;
return errorMessage;
}
reportStreamError(status: StatusObject): void {