X-Git-Url: https://git.arvados.org/lightning.git/blobdiff_plain/2f8933ea7ee9703ab5a74b0940e0d65eb953b913..5dc03e6d94f300b35c0d43f2d032e7ce9a7ade87:/merge.go

diff --git a/merge.go b/merge.go
index 4198ea88b7..68560edbd0 100644
--- a/merge.go
+++ b/merge.go
@@ -1,4 +1,8 @@
-package main
+// Copyright (C) The Lightning Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package lightning
 
 import (
 	"bufio"
@@ -70,10 +74,11 @@ func (cmd *merger) RunCommand(prog string, args []string, stdin io.Reader, stdou
 			Name:        "lightning merge",
 			Client:      arvados.NewClientFromEnv(),
 			ProjectUUID: *projectUUID,
-			RAM:         150000000000,
+			RAM:         700000000000,
 			VCPUs:       16,
 			Priority:    *priority,
 			APIAccess:   true,
+			KeepCache:   1,
 		}
 		for i := range cmd.inputs {
 			err = runner.TranslatePaths(&cmd.inputs[i])
@@ -172,7 +177,7 @@ func (cmd *merger) doMerge() error {
 		go func(input string) {
 			defer wg.Done()
 			log.Printf("%s: reading", input)
-			err := cmd.tilelib.LoadGob(ctx, rdr, strings.HasSuffix(input, ".gz"), nil)
+			err := cmd.tilelib.LoadGob(ctx, rdr, strings.HasSuffix(input, ".gz"))
 			if err != nil {
 				cmd.setError(fmt.Errorf("%s: load failed: %w", input, err))
 				cancel()