projects
/
lightning.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '21139-import-mem'
[lightning.git]
/
import.go
diff --git
a/import.go
b/import.go
index 2f1a268511c0e1cc709a2e43656788e5116c9e1c..9bc336af107acf0c4c3ffea9f95f39de0a4b3a40 100644
(file)
--- a/
import.go
+++ b/
import.go
@@
-185,7
+185,7
@@
func (cmd *importer) runBatches(stdout io.Writer, inputs []string) error {
Client: arvadosClientFromEnv,
ProjectUUID: cmd.projectUUID,
APIAccess: true,
Client: arvadosClientFromEnv,
ProjectUUID: cmd.projectUUID,
APIAccess: true,
- RAM:
70
0000000000,
+ RAM:
35
0000000000,
VCPUs: 96,
Priority: cmd.priority,
KeepCache: 1,
VCPUs: 96,
Priority: cmd.priority,
KeepCache: 1,
@@
-448,7
+448,7
@@
func (cmd *importer) tileInputs(tilelib *tileLibrary, infiles []string) error {
go close(todo)
var tileJobs sync.WaitGroup
var running int64
go close(todo)
var tileJobs sync.WaitGroup
var running int64
- for i := 0; i < runtime.GOMAXPROCS(-1)
*2
; i++ {
+ for i := 0; i < runtime.GOMAXPROCS(-1); i++ {
tileJobs.Add(1)
atomic.AddInt64(&running, 1)
go func() {
tileJobs.Add(1)
atomic.AddInt64(&running, 1)
go func() {