Skip to content

Commit

Permalink
rename job and migration because of size limitations
Browse files Browse the repository at this point in the history
  • Loading branch information
@BenCookie95
BenCookie95 committed May 24, 2024
1 parent 50d8d37 commit d6d1158
Show file tree
Hide file tree
Showing 6 changed files with 48 additions and 48 deletions.
10 changes: 5 additions & 5 deletions server/channels/app/migrations.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,13 +624,13 @@ func (s *Server) doDeleteOrphanDraftsMigration(c request.CTX) {
}
}

func (s *Server) doDeleteVisibleDmsPreferencesMigration(c request.CTX) {
func (s *Server) doDeleteDmsPreferencesMigration(c request.CTX) {
// If the migration is already marked as completed, don't do it again.
if _, err := s.Store().System().GetByName(model.MigrationKeyDeleteVisibleDmsPreferences); err == nil {
if _, err := s.Store().System().GetByName(model.MigrationKeyDeleteDmsPreferences); err == nil {
return
}

jobs, err := s.Store().Job().GetAllByTypeAndStatus(c, model.JobTypeDeleteVisibleDmsPreferencesMigration, model.JobStatusPending)
jobs, err := s.Store().Job().GetAllByTypeAndStatus(c, model.JobTypeDeleteDmsPreferencesMigration, model.JobStatusPending)
if err != nil {
mlog.Fatal("failed to get jobs by type and status", mlog.Err(err))
return
Expand All @@ -639,7 +639,7 @@ func (s *Server) doDeleteVisibleDmsPreferencesMigration(c request.CTX) {
return
}

if _, appErr := s.Jobs.CreateJobOnce(c, model.JobTypeDeleteVisibleDmsPreferencesMigration, nil); appErr != nil {
if _, appErr := s.Jobs.CreateJobOnce(c, model.JobTypeDeleteDmsPreferencesMigration, nil); appErr != nil {
mlog.Fatal("failed to start job for deleting dm preferences", mlog.Err(appErr))
return
}
Expand Down Expand Up @@ -671,5 +671,5 @@ func (s *Server) doAppMigrations() {
s.doCloudS3PathMigrations(c)
s.doDeleteEmptyDraftsMigration(c)
s.doDeleteOrphanDraftsMigration(c)
s.doDeleteVisibleDmsPreferencesMigration(c)
s.doDeleteDmsPreferencesMigration(c)
}
6 changes: 3 additions & 3 deletions server/channels/app/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ import (
"github.com/mattermost/mattermost/server/v8/channels/jobs"
"github.com/mattermost/mattermost/server/v8/channels/jobs/active_users"
"github.com/mattermost/mattermost/server/v8/channels/jobs/cleanup_desktop_tokens"
"github.com/mattermost/mattermost/server/v8/channels/jobs/delete_dms_preferences_migration"
"github.com/mattermost/mattermost/server/v8/channels/jobs/delete_empty_drafts_migration"
"github.com/mattermost/mattermost/server/v8/channels/jobs/delete_orphan_drafts_migration"
"github.com/mattermost/mattermost/server/v8/channels/jobs/delete_visible_dms_preferences_migration"
"github.com/mattermost/mattermost/server/v8/channels/jobs/expirynotify"
"github.com/mattermost/mattermost/server/v8/channels/jobs/export_delete"
"github.com/mattermost/mattermost/server/v8/channels/jobs/export_process"
Expand Down Expand Up @@ -1601,8 +1601,8 @@ func (s *Server) initJobs() {
)

s.Jobs.RegisterJobType(
model.JobTypeDeleteVisibleDmsPreferencesMigration,
delete_visible_dms_preferences_migration.MakeWorker(s.Jobs, s.Store(), New(ServerConnector(s.Channels()))),
model.JobTypeDeleteDmsPreferencesMigration,
delete_dms_preferences_migration.MakeWorker(s.Jobs, s.Store(), New(ServerConnector(s.Channels()))),
nil)

s.platform.Jobs = s.Jobs
Expand Down
10 changes: 5 additions & 5 deletions ...lete_visible_dms_preferences_migration.go → ...ation/delete_dms_preferences_migration.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

package delete_visible_dms_preferences_migration
package delete_dms_preferences_migration

import (
"time"
Expand All @@ -22,14 +22,14 @@ func MakeWorker(jobServer *jobs.JobServer, store store.Store, app jobs.BatchMigr
jobServer,
store,
app,
model.MigrationKeyDeleteVisibleDmsPreferences,
model.MigrationKeyDeleteDmsPreferences,
timeBetweenBatches,
doDeleteVisibleDmsPreferencesMigrationBatch,
doDeleteDmsPreferencesMigrationBatch,
)
}

// doDeleteVisibleDmsPreferencesMigrationBatch deletes any limit_visible_dms_gms preferences with a value > 40
func doDeleteVisibleDmsPreferencesMigrationBatch(data model.StringMap, store store.Store) (model.StringMap, bool, error) {
// doDeleteDmsPreferencesMigrationBatch deletes any limit_visible_dms_gms preferences with a value > 40
func doDeleteDmsPreferencesMigrationBatch(data model.StringMap, store store.Store) (model.StringMap, bool, error) {
rowAffected, err := store.Preference().DeleteVisibleDmsGms()
if err != nil {
return nil, false, errors.Wrapf(err, "failed to delete limit_visible_dms_gms with a value > 40")
Expand Down
4 changes: 2 additions & 2 deletions ...visible_dms_preferences_migration_test.go → .../delete_dms_preferences_migration_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.

package delete_visible_dms_preferences_migration
package delete_dms_preferences_migration

import (
"errors"
Expand All @@ -21,7 +21,7 @@ func TestDoDeleteEmptyDraftsMigrationBatch(t *testing.T) {

mockStore.DraftStore.On("DeleteVisibleDmsGms").Return(errors.New("failure"))

data, done, err := doDeleteVisibleDmsPreferencesMigrationBatch(nil, mockStore)
data, done, err := doDeleteDmsPreferencesMigrationBatch(nil, mockStore)
require.EqualError(t, err, "failed to delete empty drafts (create_at=1695920000, user_id=user_id_1): failure")
assert.False(t, done)
assert.Nil(t, data)
Expand Down
64 changes: 32 additions & 32 deletions server/public/model/job.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,38 +8,38 @@ import (
)

const (
JobTypeDataRetention = "data_retention"
JobTypeMessageExport = "message_export"
JobTypeElasticsearchPostIndexing = "elasticsearch_post_indexing"
JobTypeElasticsearchPostAggregation = "elasticsearch_post_aggregation"
JobTypeBlevePostIndexing = "bleve_post_indexing"
JobTypeLdapSync = "ldap_sync"
JobTypeMigrations = "migrations"
JobTypePlugins = "plugins"
JobTypeExpiryNotify = "expiry_notify"
JobTypeProductNotices = "product_notices"
JobTypeActiveUsers = "active_users"
JobTypeImportProcess = "import_process"
JobTypeImportDelete = "import_delete"
JobTypeExportProcess = "export_process"
JobTypeExportDelete = "export_delete"
JobTypeCloud = "cloud"
JobTypeResendInvitationEmail = "resend_invitation_email"
JobTypeExtractContent = "extract_content"
JobTypeLastAccessiblePost = "last_accessible_post"
JobTypeLastAccessibleFile = "last_accessible_file"
JobTypeUpgradeNotifyAdmin = "upgrade_notify_admin"
JobTypeTrialNotifyAdmin = "trial_notify_admin"
JobTypePostPersistentNotifications = "post_persistent_notifications"
JobTypeInstallPluginNotifyAdmin = "install_plugin_notify_admin"
JobTypeHostedPurchaseScreening = "hosted_purchase_screening"
JobTypeS3PathMigration = "s3_path_migration"
JobTypeCleanupDesktopTokens = "cleanup_desktop_tokens"
JobTypeDeleteEmptyDraftsMigration = "delete_empty_drafts_migration"
JobTypeRefreshPostStats = "refresh_post_stats"
JobTypeDeleteOrphanDraftsMigration = "delete_orphan_drafts_migration"
JobTypeExportUsersToCSV = "export_users_to_csv"
JobTypeDeleteVisibleDmsPreferencesMigration = "delete_visible_dms_preferences_migration"
JobTypeDataRetention = "data_retention"
JobTypeMessageExport = "message_export"
JobTypeElasticsearchPostIndexing = "elasticsearch_post_indexing"
JobTypeElasticsearchPostAggregation = "elasticsearch_post_aggregation"
JobTypeBlevePostIndexing = "bleve_post_indexing"
JobTypeLdapSync = "ldap_sync"
JobTypeMigrations = "migrations"
JobTypePlugins = "plugins"
JobTypeExpiryNotify = "expiry_notify"
JobTypeProductNotices = "product_notices"
JobTypeActiveUsers = "active_users"
JobTypeImportProcess = "import_process"
JobTypeImportDelete = "import_delete"
JobTypeExportProcess = "export_process"
JobTypeExportDelete = "export_delete"
JobTypeCloud = "cloud"
JobTypeResendInvitationEmail = "resend_invitation_email"
JobTypeExtractContent = "extract_content"
JobTypeLastAccessiblePost = "last_accessible_post"
JobTypeLastAccessibleFile = "last_accessible_file"
JobTypeUpgradeNotifyAdmin = "upgrade_notify_admin"
JobTypeTrialNotifyAdmin = "trial_notify_admin"
JobTypePostPersistentNotifications = "post_persistent_notifications"
JobTypeInstallPluginNotifyAdmin = "install_plugin_notify_admin"
JobTypeHostedPurchaseScreening = "hosted_purchase_screening"
JobTypeS3PathMigration = "s3_path_migration"
JobTypeCleanupDesktopTokens = "cleanup_desktop_tokens"
JobTypeDeleteEmptyDraftsMigration = "delete_empty_drafts_migration"
JobTypeRefreshPostStats = "refresh_post_stats"
JobTypeDeleteOrphanDraftsMigration = "delete_orphan_drafts_migration"
JobTypeExportUsersToCSV = "export_users_to_csv"
JobTypeDeleteDmsPreferencesMigration = "delete_dms_preferences_migration"

JobStatusPending = "pending"
JobStatusInProgress = "in_progress"
Expand Down
2 changes: 1 addition & 1 deletion server/public/model/migration.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,5 @@ const (
MigrationKeyAddIPFilteringPermissions = "add_ip_filtering_permissions"
MigrationKeyAddOutgoingOAuthConnectionsPermissions = "add_outgoing_oauth_connections_permissions"
MigrationKeyAddChannelBookmarksPermissions = "add_channel_bookmarks_permissions"
MigrationKeyDeleteVisibleDmsPreferences = "delete_visible_dms_preferences_migration"
MigrationKeyDeleteDmsPreferences = "delete_dms_preferences_migration"
)

0 comments on commit d6d1158

Please sign in to comment.