Rebuild channel index (#26080)
* WIP * Added rebuild channels index functionality * Added rough logic to send message to all sysadmins * WIP * WIP * WIP * Cleanup * i18n fix * reading through all pages of system admins * Fixed webapp style * i18n fix * Added help text * i18n fix * i18n update * Updated system console button action * Updated snapshots * some cleanup * Updated snapshot * Update server/channels/app/server.go Co-authored-by: Daniel Espino García <larkox@gmail.com> * fixed typo * Refactoring to improve readibility * moved index check to API later during config update * Added some docs * Updated get system bot --------- Co-authored-by: Daniel Espino García <larkox@gmail.com>
Этот коммит содержится в:
Harshil Sharma
коммит произвёл
GitHub
GitHub
родитель
ccc00b9077
Коммит
774df37464
@@ -338,6 +338,50 @@ exports[`components/ElasticSearchSettings should match snapshot, disabled 1`] =
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<RequestButton
|
||||
buttonText={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
defaultMessage="Rebuild Channels Index"
|
||||
id="admin.elasticsearch.rebuildChannelsIndex.title"
|
||||
/>
|
||||
}
|
||||
disabled={true}
|
||||
errorMessage={
|
||||
Object {
|
||||
"defaultMessage": "Failed to trigger channels index rebuild job: {error}",
|
||||
"id": "admin.elasticsearch.rebuildIndexSuccessfully.error",
|
||||
}
|
||||
}
|
||||
helpText={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
defaultMessage="This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.
|
||||
<b>Note- Please ensure no other indexing job is in progress in the table above.</b>"
|
||||
id="admin.elasticsearch.rebuildChannelsIndex.helpText"
|
||||
values={
|
||||
Object {
|
||||
"b": [Function],
|
||||
}
|
||||
}
|
||||
/>
|
||||
}
|
||||
id="rebuildChannelsIndexButton"
|
||||
includeDetailedError={false}
|
||||
label={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
defaultMessage="Rebuild Channels Index"
|
||||
id="admin.elasticsearch.rebuildChannelsIndex.title"
|
||||
/>
|
||||
}
|
||||
requestAction={[MockFunction]}
|
||||
saveNeeded={false}
|
||||
showSuccessMessage={true}
|
||||
successMessage={
|
||||
Object {
|
||||
"defaultMessage": "Channels index rebuild job triggered successfully.",
|
||||
"id": "admin.elasticsearch.rebuildIndexSuccessfully.success",
|
||||
}
|
||||
}
|
||||
/>
|
||||
<RequestButton
|
||||
buttonText={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
@@ -843,6 +887,50 @@ exports[`components/ElasticSearchSettings should match snapshot, enabled 1`] = `
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<RequestButton
|
||||
buttonText={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
defaultMessage="Rebuild Channels Index"
|
||||
id="admin.elasticsearch.rebuildChannelsIndex.title"
|
||||
/>
|
||||
}
|
||||
disabled={false}
|
||||
errorMessage={
|
||||
Object {
|
||||
"defaultMessage": "Failed to trigger channels index rebuild job: {error}",
|
||||
"id": "admin.elasticsearch.rebuildIndexSuccessfully.error",
|
||||
}
|
||||
}
|
||||
helpText={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
defaultMessage="This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.
|
||||
<b>Note- Please ensure no other indexing job is in progress in the table above.</b>"
|
||||
id="admin.elasticsearch.rebuildChannelsIndex.helpText"
|
||||
values={
|
||||
Object {
|
||||
"b": [Function],
|
||||
}
|
||||
}
|
||||
/>
|
||||
}
|
||||
id="rebuildChannelsIndexButton"
|
||||
includeDetailedError={false}
|
||||
label={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
defaultMessage="Rebuild Channels Index"
|
||||
id="admin.elasticsearch.rebuildChannelsIndex.title"
|
||||
/>
|
||||
}
|
||||
requestAction={[MockFunction]}
|
||||
saveNeeded={false}
|
||||
showSuccessMessage={true}
|
||||
successMessage={
|
||||
Object {
|
||||
"defaultMessage": "Channels index rebuild job triggered successfully.",
|
||||
"id": "admin.elasticsearch.rebuildIndexSuccessfully.success",
|
||||
}
|
||||
}
|
||||
/>
|
||||
<RequestButton
|
||||
buttonText={
|
||||
<Memo(MemoizedFormattedMessage)
|
||||
|
||||
@@ -12,6 +12,7 @@ import SaveButton from 'components/save_button';
|
||||
jest.mock('actions/admin_actions.jsx', () => {
|
||||
return {
|
||||
elasticsearchPurgeIndexes: jest.fn(),
|
||||
rebuildChannelsIndex: jest.fn(),
|
||||
elasticsearchTest: (config: AdminConfig, success: () => void) => success(),
|
||||
};
|
||||
});
|
||||
|
||||
@@ -8,7 +8,7 @@ import {FormattedMessage, defineMessage, defineMessages} from 'react-intl';
|
||||
import type {AdminConfig} from '@mattermost/types/config';
|
||||
import type {Job, JobType} from '@mattermost/types/jobs';
|
||||
|
||||
import {elasticsearchPurgeIndexes, elasticsearchTest} from 'actions/admin_actions.jsx';
|
||||
import {elasticsearchPurgeIndexes, elasticsearchTest, rebuildChannelsIndex} from 'actions/admin_actions.jsx';
|
||||
|
||||
import ExternalLink from 'components/external_link';
|
||||
|
||||
@@ -62,6 +62,9 @@ export const messages = defineMessages({
|
||||
elasticsearch_test_button: {id: 'admin.elasticsearch.elasticsearch_test_button', defaultMessage: 'Test Connection'},
|
||||
bulkIndexingTitle: {id: 'admin.elasticsearch.bulkIndexingTitle', defaultMessage: 'Bulk Indexing:'},
|
||||
help: {id: 'admin.elasticsearch.createJob.help', defaultMessage: 'All users, channels and posts in the database will be indexed from oldest to newest. Elasticsearch is available during indexing but search results may be incomplete until the indexing job is complete.'},
|
||||
rebuildChannelsIndexTitle: {id: 'admin.elasticsearch.rebuildChannelsIndexTitle', defaultMessage: 'Rebuild Channels Index'},
|
||||
rebuildChannelIndexHelpText: {id: 'admin.elasticsearch.rebuildChannelsIndex.helpText', defaultMessage: 'This purges the channels index and re-indexes all channels in the database, from oldest to newest. Channel autocomplete is available during indexing but search results may be incomplete until the indexing job is complete.\n<b>Note- Please ensure no other indexing job is in progress in the table above.</b>'},
|
||||
rebuildChannelsIndexButtonText: {id: 'admin.elasticsearch.rebuildChannelsIndex.title', defaultMessage: 'Rebuild Channels Index'},
|
||||
purgeIndexesHelpText: {id: 'admin.elasticsearch.purgeIndexesHelpText', defaultMessage: 'Purging will entirely remove the indexes on the Elasticsearch server. Search results may be incomplete until a bulk index of the existing database is rebuilt.'},
|
||||
purgeIndexesButton: {id: 'admin.elasticsearch.purgeIndexesButton', defaultMessage: 'Purge Index'},
|
||||
label: {id: 'admin.elasticsearch.purgeIndexesButton.label', defaultMessage: 'Purge Indexes:'},
|
||||
@@ -197,8 +200,22 @@ export default class ElasticsearchSettings extends AdminSettings<Props, State> {
|
||||
};
|
||||
|
||||
getExtraInfo(job: Job) {
|
||||
let jobSubType = null;
|
||||
if (job.data?.sub_type === 'channels_index_rebuild') {
|
||||
jobSubType = (
|
||||
<span>
|
||||
{'. '}
|
||||
<FormattedMessage
|
||||
id='admin.elasticsearch.channelIndexRebuildJobTitle'
|
||||
defaultMessage='Channels index rebuild job.'
|
||||
/>
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
let jobProgress = null;
|
||||
if (job.status === JobStatuses.IN_PROGRESS) {
|
||||
return (
|
||||
jobProgress = (
|
||||
<FormattedMessage
|
||||
id='admin.elasticsearch.percentComplete'
|
||||
defaultMessage='{percent}% Complete'
|
||||
@@ -207,7 +224,7 @@ export default class ElasticsearchSettings extends AdminSettings<Props, State> {
|
||||
);
|
||||
}
|
||||
|
||||
return null;
|
||||
return (<span>{jobProgress}{jobSubType}</span>);
|
||||
}
|
||||
|
||||
renderTitle() {
|
||||
@@ -400,6 +417,29 @@ export default class ElasticsearchSettings extends AdminSettings<Props, State> {
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<RequestButton
|
||||
id='rebuildChannelsIndexButton'
|
||||
requestAction={rebuildChannelsIndex}
|
||||
helpText={
|
||||
<FormattedMessage
|
||||
{...messages.rebuildChannelIndexHelpText}
|
||||
values={{
|
||||
b: (chunks: React.ReactNode) => (<b>{chunks}</b>),
|
||||
}}
|
||||
/>
|
||||
}
|
||||
buttonText={<FormattedMessage {...messages.rebuildChannelsIndexButtonText}/>}
|
||||
successMessage={defineMessage({
|
||||
id: 'admin.elasticsearch.rebuildIndexSuccessfully.success',
|
||||
defaultMessage: 'Channels index rebuild job triggered successfully.',
|
||||
})}
|
||||
errorMessage={defineMessage({
|
||||
id: 'admin.elasticsearch.rebuildIndexSuccessfully.error',
|
||||
defaultMessage: 'Failed to trigger channels index rebuild job: {error}',
|
||||
})}
|
||||
disabled={!this.state.canPurgeAndIndex || this.props.isDisabled!}
|
||||
label={<FormattedMessage {...messages.rebuildChannelsIndexButtonText}/>}
|
||||
/>
|
||||
<RequestButton
|
||||
id='purgeIndexesSection'
|
||||
requestAction={elasticsearchPurgeIndexes}
|
||||
|
||||
@@ -29,6 +29,8 @@ export type Props = {
|
||||
className?: string;
|
||||
hideJobCreateButton?: boolean;
|
||||
createJobButtonText: React.ReactNode;
|
||||
hideTable?: boolean;
|
||||
jobData?: any;
|
||||
actions: {
|
||||
getJobsByType: (jobType: JobType) => void;
|
||||
cancelJob: (jobId: string) => Promise<ActionResult>;
|
||||
@@ -75,6 +77,7 @@ class JobTable extends React.PureComponent<Props> {
|
||||
e.preventDefault();
|
||||
const job = {
|
||||
type: this.props.jobType,
|
||||
data: this.props.jobData,
|
||||
};
|
||||
|
||||
await this.props.actions.createJob(job);
|
||||
@@ -131,53 +134,56 @@ class JobTable extends React.PureComponent<Props> {
|
||||
{this.props.createJobHelpText}
|
||||
</div>
|
||||
</div>
|
||||
<div className='job-table__table'>
|
||||
<table
|
||||
className='table'
|
||||
data-testid='jobTable'
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th className='cancel-button-field'/>
|
||||
<th>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerStatus'
|
||||
defaultMessage='Status'
|
||||
/>
|
||||
</th>
|
||||
{showFilesColumn &&
|
||||
{
|
||||
!this.props.hideTable &&
|
||||
<div className='job-table__table'>
|
||||
<table
|
||||
className='table'
|
||||
data-testid='jobTable'
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th className='cancel-button-field'/>
|
||||
<th>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerStatus'
|
||||
defaultMessage='Status'
|
||||
/>
|
||||
</th>
|
||||
{showFilesColumn &&
|
||||
<th>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerFiles'
|
||||
defaultMessage='Files'
|
||||
/>
|
||||
</th>
|
||||
}
|
||||
<th>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerFinishAt'
|
||||
defaultMessage='Finish Time'
|
||||
/>
|
||||
</th>
|
||||
<th>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerRunTime'
|
||||
defaultMessage='Run Time'
|
||||
/>
|
||||
</th>
|
||||
<th colSpan={3}>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerExtraInfo'
|
||||
defaultMessage='Details'
|
||||
/>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{items}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
}
|
||||
<th>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerFinishAt'
|
||||
defaultMessage='Finish Time'
|
||||
/>
|
||||
</th>
|
||||
<th>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerRunTime'
|
||||
defaultMessage='Run Time'
|
||||
/>
|
||||
</th>
|
||||
<th colSpan={3}>
|
||||
<FormattedMessage
|
||||
id='admin.jobTable.headerExtraInfo'
|
||||
defaultMessage='Details'
|
||||
/>
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{items}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user