Skip to content

Commit 7ddd856

Browse files
authored
Merge pull request #3388 from fschade/fix-search-write-visibility
fix(search): refresh the opensearch index after a write
2 parents 9796123 + ed5b6ee commit 7ddd856

3 files changed

Lines changed: 27 additions & 1 deletion

File tree

‎services/search/pkg/opensearch/backend_test.go‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,29 @@ var _ = Describe("Backend", func() {
214214
})
215215
})
216216

217+
Describe("WriteVisibility", func() {
218+
const indexName = "opencloud-test-engine-write-visibility"
219+
220+
It("deletes a record that was just written", func() {
221+
document := opensearchtest.Testdata.Resources.File
222+
document.ID = "1$1!95"
223+
document.Name = "textfile.txt"
224+
document.Path = "./textfile.txt"
225+
226+
backend, tc := newBackend(indexName)
227+
deleteIndexOnCleanup(tc, indexName)
228+
229+
Expect(backend.Upsert(document.ID, document)).To(Succeed())
230+
Expect(backend.Delete(document.ID)).To(Succeed())
231+
232+
resp, err := backend.Search(context.Background(), &searchService.SearchIndexRequest{
233+
Query: fmt.Sprintf(`name:"%s"`, document.Name),
234+
})
235+
Expect(err).ToNot(HaveOccurred())
236+
Expect(resp.Matches).To(BeEmpty())
237+
})
238+
})
239+
217240
Describe("Delete", func() {
218241
const indexName = "opencloud-test-engine-delete"
219242

‎services/search/pkg/opensearch/batch.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ func (b *Batch) Purge(id string, onlyDeleted bool) error {
158158
Indices: []string{b.index},
159159
Params: opensearchgoAPI.DocumentDeleteByQueryParams{
160160
WaitForCompletion: conversions.ToPointer(true),
161+
Refresh: conversions.ToPointer(true),
161162
},
162163
},
163164
query,
@@ -210,7 +211,8 @@ func (b *Batch) Push() error {
210211
}
211212

212213
if _, err := b.client.Bulk(context.Background(), opensearchgoAPI.BulkReq{
213-
Body: strings.NewReader(body.String()),
214+
Body: strings.NewReader(body.String()),
215+
Params: opensearchgoAPI.BulkParams{Refresh: "wait_for"},
214216
}); err != nil {
215217
return fmt.Errorf("failed to execute bulk operations: %w", err)
216218
}

‎services/search/pkg/opensearch/opensearch.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ func updateSelfAndDescendants(ctx context.Context, client *opensearchgoAPI.Clien
5454
Indices: []string{index},
5555
Params: opensearchgoAPI.UpdateByQueryParams{
5656
WaitForCompletion: conversions.ToPointer(true),
57+
Refresh: conversions.ToPointer(true),
5758
},
5859
},
5960
osu.NewBoolQuery().

0 commit comments

Comments
 (0)