Commit ec05100
fix(identifier): forceRun() resumes backfill after server restart mid-migration
Previously forceRun() returned false once idx_identifier_base_type existed,
permanently abandoning millions of NULL base_type rows if the server restarted
mid-backfill.
Fix: also return true when hasPendingRows() detects identifier rows with
null base_type and non-null asset_subtype. DDL uses IF NOT EXISTS so
re-running executeUpgrade() is always safe.
Tests: replace incorrect false-when-index-exists assertion with two cases:
- returns false only when index exists AND no pending rows remain
- returns true when index exists but backfill is incomplete (restart scenario)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>1 parent b27bcc9 commit ec05100
2 files changed
Lines changed: 44 additions & 8 deletions
File tree
- dotCMS/src/main/java/com/dotmarketing/startup/runonce
- dotcms-integration/src/test/java/com/dotmarketing/startup/runonce
dotCMS/src/main/java/com/dotmarketing/startup/runonce/Task260331AddBaseTypeColumnToIdentifier.java
Lines changed: 8 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
29 | | - | |
30 | 28 | | |
| 29 | + | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
34 | 33 | | |
35 | | - | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
36 | 40 | | |
37 | | - | |
| 41 | + | |
38 | 42 | | |
39 | 43 | | |
40 | 44 | | |
| |||
Lines changed: 36 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
67 | | - | |
| 66 | + | |
| 67 | + | |
68 | 68 | | |
69 | 69 | | |
70 | | - | |
| 70 | + | |
71 | 71 | | |
72 | 72 | | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
76 | | - | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
77 | 109 | | |
78 | 110 | | |
79 | 111 | | |
| |||
0 commit comments