[arvados] updated: 2.1.0-3171-g31d313866

[git repository hosting]

Summary of changes:
 lib/boot/rails_db.go | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

       via  31d3138660ee51eccaceb52f99730b6124755b93 (commit)
      from  41b9b83812826b77034fe13ea34047e194b1027f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 31d3138660ee51eccaceb52f99730b6124755b93
Author: Tom Clegg <tom at curii.com>
Date:   Fri Dec 9 15:01:17 2022 -0500

    19709: Explain design in comments. Improve migration filename check.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/boot/rails_db.go b/lib/boot/rails_db.go
index 3f8151144..44ceb263c 100644
--- a/lib/boot/rails_db.go
+++ b/lib/boot/rails_db.go
@@ -21,6 +21,10 @@ func (runner railsDatabase) String() string {
 	return "railsDatabase"
 }
 
+// Run checks for and applies any pending Rails database migrations.
+//
+// If running a dev/test environment, and the database is empty, it
+// initializes the database.
 func (runner railsDatabase) Run(ctx context.Context, fail func(error), super *Supervisor) error {
 	err := super.wait(ctx, runPostgreSQL{}, installPassenger{src: "services/api"})
 	if err != nil {
@@ -35,11 +39,33 @@ func (runner railsDatabase) Run(ctx context.Context, fail func(error), super *Su
 		appdir = filepath.Join(super.SourcePath, "services/api")
 	}
 
-	// list versions in db/migrate/{version}_{name}.rb
+	// Check for pending migrations before running rake.
+	//
+	// In principle, we could use "rake db:migrate:status" or skip
+	// this check entirely and let "rake db:migrate" be a no-op
+	// most of the time.  However, in the most common case when
+	// there are no new migrations, that would add ~2s to startup
+	// time / downtime during service restart.
+
 	todo := map[string]bool{}
+
+	// list versions in db/migrate/{version}_{name}.rb
 	fs.WalkDir(os.DirFS(appdir), "db/migrate", func(path string, d fs.DirEntry, err error) error {
-		if cut := strings.Index(d.Name(), "_"); cut > 0 && strings.HasSuffix(d.Name(), ".rb") {
-			todo[d.Name()[:cut]] = true
+		fnm := d.Name()
+		if !strings.HasSuffix(fnm, ".rb") {
+			return nil
+		}
+		for i, c := range fnm {
+			if i > 0 && c == '_' {
+				todo[fnm[:i]] = true
+				break
+			}
+			if c < '0' || c > '9' {
+				// non-numeric character before the
+				// first '_' means this is not a
+				// migration
+				break
+			}
 		}
 		return nil
 	})

-----------------------------------------------------------------------


hooks/post-receive
--