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

Treat ring_hash_lb_config field as optional

This commit is contained in:
Michael Lumish 2023-09-12 10:08:25 -07:00
parent 57c1bd2ede
commit 8df1bd712f
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/grpc-js-xds/src/xds-resource-type/cluster-resource-type.ts
View File

@ -151,17 +151,14 @@ export class ClusterResourceType extends XdsResourceType {
} }
}; };
} else if(EXPERIMENTAL_RING_HASH && message.lb_policy === 'RING_HASH') { } else if(EXPERIMENTAL_RING_HASH && message.lb_policy === 'RING_HASH') {
if (!message.ring_hash_lb_config) { if (message.ring_hash_lb_config && message.ring_hash_lb_config.hash_function !== 'XX_HASH') {
return null; return null;
} }
if (message.ring_hash_lb_config.hash_function !== 'XX_HASH') { const minRingSize = message.ring_hash_lb_config?.minimum_ring_size ? Number(message.ring_hash_lb_config.minimum_ring_size.value) : 1024;
return null;
}
const minRingSize = message.ring_hash_lb_config.minimum_ring_size ? Number(message.ring_hash_lb_config.minimum_ring_size.value) : 1024;
if (minRingSize > 8_388_608) { if (minRingSize > 8_388_608) {
return null; return null;
} }
const maxRingSize = message.ring_hash_lb_config.maximum_ring_size ? Number(message.ring_hash_lb_config.maximum_ring_size.value) : 8_388_608; const maxRingSize = message.ring_hash_lb_config?.maximum_ring_size ? Number(message.ring_hash_lb_config.maximum_ring_size.value) : 8_388_608;
if (maxRingSize > 8_388_608) { if (maxRingSize > 8_388_608) {
return null; return null;
} }

3
packages/grpc-js-xds/test/framework.ts
View File

@ -96,9 +96,6 @@ export class FakeEdsCluster implements FakeCluster {
}; };
if (this.loadBalancingPolicyOverride === 'RING_HASH') { if (this.loadBalancingPolicyOverride === 'RING_HASH') {
result.lb_policy = 'RING_HASH'; result.lb_policy = 'RING_HASH';
result.ring_hash_lb_config = {
hash_function: 'XX_HASH'
};
} else if (this.loadBalancingPolicyOverride) { } else if (this.loadBalancingPolicyOverride) {
result.load_balancing_policy = { result.load_balancing_policy = {
policies: [ policies: [