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

Jump to bottom

[UPDATED] JetStream: consumer configuration check #564

Merged
merged 1 commit into from
Jul 25, 2022
Merged

[UPDATED] JetStream: consumer configuration check #564

Show file tree
Hide file tree
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
23 changes: 21 additions & 2 deletions src/js.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1981,6 +1981,9 @@ _checkConfig(jsConsumerConfig *s, jsConsumerConfig *u)
if (u->MaxDeliver > 0 && u->MaxDeliver != s->MaxDeliver)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "max deliver", u->MaxDeliver, s->MaxDeliver);

if (u->BackOffLen > 0 && u->BackOffLen != s->BackOffLen)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%d" CFG_CHECK_ERR_END "%d", "backoff list length", u->BackOffLen, s->BackOffLen);

if ((int) u->ReplayPolicy >= 0 && u->ReplayPolicy != s->ReplayPolicy)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%d" CFG_CHECK_ERR_END "%d", "replay policy", u->ReplayPolicy, s->ReplayPolicy);

Expand All @@ -1994,9 +1997,7 @@ _checkConfig(jsConsumerConfig *s, jsConsumerConfig *u)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "max waiting", u->MaxWaiting, s->MaxWaiting);

if (u->MaxAckPending > 0 && u->MaxAckPending != s->MaxAckPending)
{
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "max ack pending", u->MaxAckPending, s->MaxAckPending);
}

// For flow control, we want to fail if the user explicit wanted it, but
// it is not set in the existing consumer. If it is not asked by the user,
Expand All @@ -2007,6 +2008,24 @@ _checkConfig(jsConsumerConfig *s, jsConsumerConfig *u)
if (u->Heartbeat > 0 && u->Heartbeat != s->Heartbeat)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "heartbeat", u->Heartbeat, s->Heartbeat);

if (u->HeadersOnly != s->HeadersOnly)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%d" CFG_CHECK_ERR_END "%d", "headers only", u->HeadersOnly, s->HeadersOnly);

if (u->MaxRequestBatch > 0 && u->MaxRequestBatch != s->MaxRequestBatch)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "max request batch", u->Heartbeat, s->Heartbeat);

if (u->MaxRequestExpires > 0 && u->MaxRequestExpires != s->MaxRequestExpires)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "max request expires", u->MaxRequestExpires, s->MaxRequestExpires);

if (u->InactiveThreshold > 0 && u->InactiveThreshold != s->InactiveThreshold)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "inactive threshold", u->InactiveThreshold, s->InactiveThreshold);

if (u->Replicas > 0 && u->Replicas != s->Replicas)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%" PRId64 CFG_CHECK_ERR_END "%" PRId64, "replicas", u->Replicas, s->Replicas);

if (u->MemoryStorage != s->MemoryStorage)
return nats_setError(NATS_ERR, CFG_CHECK_ERR_START "%d" CFG_CHECK_ERR_END "%d", "memory storage", u->MemoryStorage, s->MemoryStorage);

return NATS_OK;
}

Expand Down
73 changes: 70 additions & 3 deletions test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25573,8 +25573,10 @@ test_JetStreamSubscribeConfigCheck(void)
jsStreamConfig sc;
jsConsumerConfig cc;
int i;
int64_t backOffListOf3[3] = {1, 2, 3};
int64_t backOffListOf2[2] = {1, 2};

JS_SETUP(2, 2, 0);
JS_SETUP(2, 9, 0);

test("Create stream: ");
jsStreamConfig_Init(&sc);
Expand All @@ -25584,7 +25586,7 @@ test_JetStreamSubscribeConfigCheck(void)
s = js_AddStream(NULL, js, &sc, NULL, &jerr);
testCond((s == NATS_OK) && (jerr == 0));

for (i=0; i<10; i++)
for (i=0; i<17; i++)
{
jsSubOptions so1;
jsSubOptions so2;
Expand Down Expand Up @@ -25665,6 +25667,59 @@ test_JetStreamSubscribeConfigCheck(void)
so2.Config.SampleFrequency = "50%";
break;
}
case 10:
{
name = "backoff";
so1.Config.BackOff = backOffListOf3;
so1.Config.BackOffLen = 3;
so1.Config.MaxDeliver = 5;
so2.Config.BackOff = backOffListOf2;
so2.Config.BackOffLen = 2;
so2.Config.MaxDeliver = 5;
break;
}
case 11:
{
name = "headers only";
so1.Config.HeadersOnly = true;
// Not setting it for the 2nd subscribe call should fail.
break;
}
case 12:
{
name = "max request batch";
so1.Config.MaxRequestBatch = 100;
so2.Config.MaxRequestBatch = 200;
break;
}
case 13:
{
name = "max request expires";
so1.Config.MaxRequestExpires = NATS_SECONDS_TO_NANOS(1);
so2.Config.MaxRequestExpires = NATS_SECONDS_TO_NANOS(2);
break;
}
case 14:
{
name = "inactive threshold";
so1.Config.InactiveThreshold = NATS_SECONDS_TO_NANOS(1);
so2.Config.InactiveThreshold = NATS_SECONDS_TO_NANOS(2);
break;
}
case 15:
{
name = "replicas";
so1.Config.Replicas = 1;
so2.Config.Replicas = 3;
break;
}
case 16:
{
name = "memory storage";
so1.Config.MemoryStorage = true;
// Not setting it for the 2nd subscribe call should fail.
break;
}
}
snprintf(testName, sizeof(testName), "Check %s: ", name);
test(testName);
Expand Down Expand Up @@ -25736,7 +25791,7 @@ test_JetStreamSubscribeConfigCheck(void)
}

// Verify that we don't fail if user did not set it.
for (i=0; i<9; i++)
for (i=0; i<14; i++)
{
natsSubscription *nsub = NULL;
jsSubOptions so;
Expand All @@ -25753,6 +25808,18 @@ test_JetStreamSubscribeConfigCheck(void)
case 6: name = "replay policy"; so.Config.ReplayPolicy = js_ReplayInstant; break;
case 7: name = "max waiting"; so.Config.MaxWaiting = 10; break;
case 8: name = "max ack pending"; so.Config.MaxAckPending = 10; break;
case 9:
{
name = "backoff";
so.Config.BackOff = backOffListOf3;
so.Config.BackOffLen = 3;
so.Config.MaxDeliver = 4;
break;
}
case 10: name = "max request batch"; so.Config.MaxRequestBatch = 100; break;
case 11: name = "max request expires"; so.Config.MaxRequestExpires = NATS_SECONDS_TO_NANOS(2); break;
case 12: name = "inactive threshold"; so.Config.InactiveThreshold = NATS_SECONDS_TO_NANOS(2); break;
case 13: name = "replicas"; so.Config.Replicas = 1; break;
}

natsNUID_Next(durName, sizeof(durName));
Expand Down