Skip to content

Commit 8df1bd7

Browse files
committed
Treat ring_hash_lb_config field as optional
1 parent 57c1bd2 commit 8df1bd7

File tree

2 files changed

+3
-9
lines changed

2 files changed

+3
-9
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,17 +151,14 @@ export class ClusterResourceType extends XdsResourceType {
151151
}
152152
};
153153
} else if(EXPERIMENTAL_RING_HASH && message.lb_policy === 'RING_HASH') {
154-
if (!message.ring_hash_lb_config) {
154+
if (message.ring_hash_lb_config && message.ring_hash_lb_config.hash_function !== 'XX_HASH') {
155155
return null;
156156
}
157-
if (message.ring_hash_lb_config.hash_function !== 'XX_HASH') {
158-
return null;
159-
}
160-
const minRingSize = message.ring_hash_lb_config.minimum_ring_size ? Number(message.ring_hash_lb_config.minimum_ring_size.value) : 1024;
157+
const minRingSize = message.ring_hash_lb_config?.minimum_ring_size ? Number(message.ring_hash_lb_config.minimum_ring_size.value) : 1024;
161158
if (minRingSize > 8_388_608) {
162159
return null;
163160
}
164-
const maxRingSize = message.ring_hash_lb_config.maximum_ring_size ? Number(message.ring_hash_lb_config.maximum_ring_size.value) : 8_388_608;
161+
const maxRingSize = message.ring_hash_lb_config?.maximum_ring_size ? Number(message.ring_hash_lb_config.maximum_ring_size.value) : 8_388_608;
165162
if (maxRingSize > 8_388_608) {
166163
return null;
167164
}

packages/grpc-js-xds/test/framework.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,6 @@ export class FakeEdsCluster implements FakeCluster {
9696
};
9797
if (this.loadBalancingPolicyOverride === 'RING_HASH') {
9898
result.lb_policy = 'RING_HASH';
99-
result.ring_hash_lb_config = {
100-
hash_function: 'XX_HASH'
101-
};
10299
} else if (this.loadBalancingPolicyOverride) {
103100
result.load_balancing_policy = {
104101
policies: [

0 commit comments

Comments
 (0)