Merge pull request #100 from github/forty

Adjust importer's push limits

Author: spraints

internal/integration/integration_test.go

@@ -236,6 +236,7 @@ func (suite *SpokesReceivePackTestSuite) TestSpokesReceivePackAllowedWhenWithImp
 	assert.NoError(suite.T(), chdir(suite.T(), suite.localRepo), "unable to chdir into our local Git repo")
 	cmd := exec.Command("git", "push", "--all", "--receive-pack=spokes-receive-pack-wrapper", "r")
 	cmd.Env = append(os.Environ(),
+		"GIT_SOCKSTAT_VAR_is_importing=bool:true",
 		"GIT_SOCKSTAT_VAR_import_skip_push_limit=bool:true",
 	)
 	err := cmd.Run()
@@ -245,6 +246,23 @@ func (suite *SpokesReceivePackTestSuite) TestSpokesReceivePackAllowedWhenWithImp
 		"unexpected failure with the custom spokes-receive-pack program; it should have succeeded")
 }
 
+func (suite *SpokesReceivePackTestSuite) TestSpokesReceivePackAllowedWhenImporting() {
+	assert.NoError(suite.T(), chdir(suite.T(), suite.remoteRepo), "unable to chdir into our remote Git repo")
+	// Set a really low value to receive.maxsize in order to make it fail
+	require.NoError(suite.T(), exec.Command("git", "config", "receive.maxsize", "1").Run())
+
+	assert.NoError(suite.T(), chdir(suite.T(), suite.localRepo), "unable to chdir into our local Git repo")
+	cmd := exec.Command("git", "push", "--all", "--receive-pack=spokes-receive-pack-wrapper", "r")
+	cmd.Env = append(os.Environ(),
+		"GIT_SOCKSTAT_VAR_is_importing=bool:true",
+	)
+	err := cmd.Run()
+	assert.NoError(
+		suite.T(),
+		err,
+		"unexpected failure with the custom spokes-receive-pack program; it should have succeeded")
+}
+
 func (suite *SpokesReceivePackTestSuite) TestWithGovernor() {
 	started := make(chan any)
 	govSock, msgs, cleanup := startFakeGovernor(suite.T(), started, nil)

internal/spokes/spokes.go

@@ -955,12 +955,14 @@ func (r *spokesReceivePack) isFsckConfigEnabled() bool {
 }
 
 func (r *spokesReceivePack) getMaxInputSize() (int, error) {
-	// We want to skip the default push limit when the `import_skip_push_limit`
-	// stat is set only.
-	// We keep using the `is_import` here for backward compatibility only,
-	// which should be removed on a subsequent PR.
-	if isImporting() || skipPushLimit() {
-		return 80 * 1024 * 1024 * 1024, nil /* 80 GB */
+	switch {
+	case isImporting() && skipPushLimit():
+		// If the import has been allow-listed, use a higher limit.
+		return 80 * 1024 * 1024 * 1024, nil
+	case isImporting():
+		// Imports are allowed to push in 40 GiB by default. This
+		// setting makes it so that GEI has parity with ECI.
+		return 40 * 1024 * 1024 * 1024, nil
 	}
 
 	maxSize := r.config.Get("receive.maxsize")