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

Bugfix NGT flush logic #2598

Merged
merged 17 commits into from
Sep 11, 2024
Merged

Bugfix NGT flush logic #2598

Changes from 3 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4a90356
fix: bugfix flush logic
hlts2 Sep 9, 2024
833ccf7
fix: nil check for flushing
hlts2 Sep 9, 2024
50861c7
fix: add flush check logic
hlts2 Sep 9, 2024
f8b76c6
fix: nil check bug
hlts2 Sep 9, 2024
d27ba65
fix: add nil check
hlts2 Sep 9, 2024
3433f28
fix: return err when the flush process is executing
hlts2 Sep 9, 2024
42d0553
fix: add error check for flushing
hlts2 Sep 9, 2024
0500393
fix: error message
hlts2 Sep 9, 2024
9d1f550
fix: disable kvs and vqueue initialization
hlts2 Sep 9, 2024
9588ef3
fix: disable commentout
hlts2 Sep 9, 2024
c561c89
fix: disable kvs and vq
hlts2 Sep 9, 2024
b3151dc
fix: nil set to kvs and vq
hlts2 Sep 9, 2024
d4c79e2
fix: copy ngt service object for flushing
hlts2 Sep 10, 2024
3506054
fix: deleted unnecessary nil check
hlts2 Sep 10, 2024
b768b5d
fix: variable name
hlts2 Sep 10, 2024
8738f12
Merge branch 'main' into fix/ngt/index
hlts2 Sep 10, 2024
c293365
Merge branch 'main' into fix/ngt/index
kpango Sep 10, 2024
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
17 changes: 13 additions & 4 deletions pkg/agent/core/ngt/service/ngt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,7 +1249,7 @@
runtime.GC()
atomic.AddUint64(&n.nogce, 1)

if n.inMem {
if !n.inMem {

Check warning on line 1252 in pkg/agent/core/ngt/service/ngt.go

View check run for this annotation

Codecov / codecov/patch

pkg/agent/core/ngt/service/ngt.go#L1252 

Added line #L1252 was not covered by tests
hlts2 marked this conversation as resolved.
Show resolved Hide resolved
// delete file
err = file.DeleteDir(ctx, n.path)
if err != nil {
Expand Down Expand Up @@ -1941,15 +1941,24 @@
}

func (n *ngt) Len() uint64 {
return n.kvs.Len()
if n != nil && n.kvs != nil && !n.IsFlushing() {
return n.kvs.Len()
}
return 0

Check warning on line 1947 in pkg/agent/core/ngt/service/ngt.go

View check run for this annotation

Codecov / codecov/patch

pkg/agent/core/ngt/service/ngt.go#L1947 

Added line #L1947 was not covered by tests
hlts2 marked this conversation as resolved.
Show resolved Hide resolved
}

func (n *ngt) InsertVQueueBufferLen() uint64 {
return uint64(n.vq.IVQLen())
if n != nil && n.kvs != nil && !n.IsFlushing() {
return uint64(n.vq.IVQLen())
}
return 0

Check warning on line 1954 in pkg/agent/core/ngt/service/ngt.go

View check run for this annotation

Codecov / codecov/patch

pkg/agent/core/ngt/service/ngt.go#L1954 

Added line #L1954 was not covered by tests
hlts2 marked this conversation as resolved.
Show resolved Hide resolved
}

func (n *ngt) DeleteVQueueBufferLen() uint64 {
return uint64(n.vq.DVQLen())
if n != nil && n.kvs != nil && !n.IsFlushing() {
return uint64(n.vq.DVQLen())
}
return 0

Check warning on line 1961 in pkg/agent/core/ngt/service/ngt.go

View check run for this annotation

Codecov / codecov/patch

pkg/agent/core/ngt/service/ngt.go#L1961 

Added line #L1961 was not covered by tests
hlts2 marked this conversation as resolved.
Show resolved Hide resolved
}

func (n *ngt) GetDimensionSize() int {
Expand Down
Loading