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

Improve reindex handling for .opensearch-notebooks #163

Merged
merged 4 commits into from
Oct 28, 2021
Merged

Improve reindex handling for .opensearch-notebooks #163

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c615893
Extract reindex function
joshuali925 Oct 20, 2021
216f2dc
Remove deleting notebooks index
joshuali925 Oct 22, 2021
62ef762
Add doc count check after reindex
joshuali925 Oct 27, 2021
28e7003
Fix styles
joshuali925 Oct 27, 2021
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
29 changes: 17 additions & 12 deletions ...ch-observability/src/main/kotlin/org/opensearch/observability/index/ObservabilityIndex.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import org.opensearch.ResourceAlreadyExistsException
import org.opensearch.ResourceNotFoundException
import org.opensearch.action.DocWriteResponse
import org.opensearch.action.admin.indices.create.CreateIndexRequest
import org.opensearch.action.admin.indices.delete.DeleteIndexRequest
import org.opensearch.action.bulk.BulkRequest
import org.opensearch.action.delete.DeleteRequest
import org.opensearch.action.get.GetRequest
Expand Down Expand Up @@ -104,7 +103,6 @@ internal object ObservabilityIndex {

/**
* Create index using the mapping and settings defined in resource
* If .opensearch-notebooks index exists, reindex it to .opensearch-observability index and remove it
*/
@Suppress("TooGenericExceptionCaught")
private fun createIndex() {
Expand All @@ -120,6 +118,7 @@ internal object ObservabilityIndex {
val response = actionFuture.actionGet(PluginSettings.operationTimeoutMs)
if (response.isAcknowledged) {
log.info("$LOG_PREFIX:Index $INDEX_NAME creation Acknowledged")
reindexNotebooks()
} else {
throw IllegalStateException("$LOG_PREFIX:Index $INDEX_NAME creation not Acknowledged")
}
Expand All @@ -129,6 +128,13 @@ internal object ObservabilityIndex {
}
}
}
}

/**
* Reindex .opensearch-notebooks to .opensearch-observability index
*/
@Suppress("TooGenericExceptionCaught")
private fun reindexNotebooks() {
if (isIndexExists(NOTEBOOKS_INDEX_NAME)) {
try {
log.info("$LOG_PREFIX:Index - reindex $NOTEBOOKS_INDEX_NAME to $INDEX_NAME")
Expand All @@ -144,17 +150,16 @@ internal object ObservabilityIndex {
throw IllegalStateException("$LOG_PREFIX:Index - reindex $NOTEBOOKS_INDEX_NAME failed with searchFailures")
} else if (reindexResponse.bulkFailures.isNotEmpty()) {
throw IllegalStateException("$LOG_PREFIX:Index - reindex $NOTEBOOKS_INDEX_NAME failed with bulkFailures")
} else if (reindexResponse.total != reindexResponse.created + reindexResponse.updated) {
Copy link
Member

@ps48 ps48 Oct 27, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rather than doing this. Should we check number of docs in notebooks index before reindex and match it to total reindexResponse.total or reindexResponse.created + reindexResponse.updated.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

reindexResponse.total is the number of docs this request tried to process, which equals the number of docs in notebooks because there is no search query

throw IllegalStateException(
"$LOG_PREFIX:Index - reindex number of docs created:${reindexResponse.created} + " +
"updated:${reindexResponse.updated} does not equal requested:${reindexResponse.total}"
)
}

log.info("$LOG_PREFIX:Index - ${reindexResponse.total} docs reindexed to $INDEX_NAME")
val deleteIndexRequest = DeleteIndexRequest(NOTEBOOKS_INDEX_NAME)
val actionFuture = client.admin().indices().delete(deleteIndexRequest)
val deleteIndexResponse = actionFuture.actionGet(PluginSettings.operationTimeoutMs)
if (deleteIndexResponse.isAcknowledged) {
log.info("$LOG_PREFIX:Index $INDEX_NAME deletion Acknowledged")
} else {
throw IllegalStateException("$LOG_PREFIX:Index $NOTEBOOKS_INDEX_NAME deletion not Acknowledged")
}
log.info(
"$LOG_PREFIX:Index - reindex ${reindexResponse.created} docs created " +
"and ${reindexResponse.updated} docs updated in $INDEX_NAME"
)
} catch (exception: Exception) {
if (exception !is ResourceNotFoundException && exception.cause !is ResourceNotFoundException) {
throw exception
Expand Down