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

[FIX] KV delete not working correctly accross mirrors #1115

Merged
merged 1 commit into from Nov 1, 2022
Merged

[FIX] KV delete not working correctly accross mirrors #1115

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion kv.go
View file
Open in desktop
Expand Up @@ -665,7 +665,11 @@ func (kv *kvs) Delete(key string, opts ...DeleteOpt) error {
if kv.useJSPfx {
b.WriteString(kv.js.opts.pre)
}
b.WriteString(kv.pre)
if kv.putPre != _EMPTY_ {
b.WriteString(kv.putPre)
} else {
b.WriteString(kv.pre)
}
b.WriteString(key)

// DEL op marker. For watch functionality.
Expand Down
31 changes: 29 additions & 2 deletions test/kv_test.go
View file
Open in desktop
Expand Up @@ -898,6 +898,10 @@ func TestKeyValueMirrorCrossDomains(t *testing.T) {
expectOk(t, err)
_, err = kv.PutString("age", "22")
expectOk(t, err)
_, err = kv.PutString("v", "v")
expectOk(t, err)
err = kv.Delete("v")
expectOk(t, err)

lnc, ljs := jsClient(t, ln)
defer lnc.Close()
Expand Down Expand Up @@ -933,7 +937,7 @@ func TestKeyValueMirrorCrossDomains(t *testing.T) {
checkFor(t, 2*time.Second, 15*time.Millisecond, func() error {
si, err := ljs.StreamInfo("KV_MIRROR")
expectOk(t, err)
if si.State.Msgs == 2 {
if si.State.Msgs == 3 {
return nil
}
return fmt.Errorf("Did not get synched messages: %d", si.State.Msgs)
Expand All @@ -946,7 +950,19 @@ func TestKeyValueMirrorCrossDomains(t *testing.T) {
_, err = mkv.PutString("name", "rip")
expectOk(t, err)

e, err := mkv.Get("name")
_, err = mkv.PutString("v", "vv")
expectOk(t, err)
e, err := mkv.Get("v")
expectOk(t, err)
if e.Operation() != nats.KeyValuePut {
t.Fatalf("Got wrong value: %q vs %q", e.Operation(), nats.KeyValuePut)
}
err = mkv.Delete("v")
expectOk(t, err)
_, err = mkv.Get("v")
expectErr(t, err, nats.ErrKeyNotFound)

e, err = mkv.Get("name")
expectOk(t, err)
if string(e.Value()) != "rip" {
t.Fatalf("Got wrong value: %q vs %q", e.Value(), "rip")
Expand All @@ -967,6 +983,17 @@ func TestKeyValueMirrorCrossDomains(t *testing.T) {
if string(e.Value()) != "ivan" {
t.Fatalf("Got wrong value: %q vs %q", e.Value(), "ivan")
}
_, err = rkv.PutString("v", "vv")
expectOk(t, err)
e, err = mkv.Get("v")
expectOk(t, err)
if e.Operation() != nats.KeyValuePut {
t.Fatalf("Got wrong value: %q vs %q", e.Operation(), nats.KeyValuePut)
}
err = rkv.Delete("v")
expectOk(t, err)
_, err = rkv.Get("v")
expectErr(t, err, nats.ErrKeyNotFound)

// Shutdown cluster and test get still work.
shutdownJSServerAndRemoveStorage(t, s)
Expand Down