* swarm/api: fix file descriptor leak in NewTestSwarmServer
Swarm storage (localstore) was not closed. That resulted a
"too many open files" error if `TestClientUploadDownloadRawEncrypted`
was run with `-count 1000`.
* cmd/swarm: speed up StartNewNodes() by parallelization
Reduce cluster startup time from 13s to 7s.
* swarm/api: disable flaky TestClientUploadDownloadRawEncrypted with -race
* swarm/storage: disable flaky TestLDBStoreCollectGarbage (-race)
With race detection turned on the disabled cases often fail with:
"ldbstore_test.go:535: expected surplus chunk 150 to be missing, but got no error"
* cmd/swarm: fix process leak in TestACT and TestSwarmUp
Each test run we start 3 nodes, but we did not terminate them. So
those 3 nodes continued eating up 1.2GB (3.4GB with -race) after test
completion.
6b6c4d1c27 changed how we start clusters
to speed up tests. The changeset merged together test cases
and introduced a global cluster. But "forgot" about termination.
Let's get rid of "global cluster" so we have a clear owner of
termination (some time sacrifice), while leaving subtests to use the
same cluster.
		
	
		
			
				
	
	
		
			99 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			99 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2017 The go-ethereum Authors
 | |
| // This file is part of the go-ethereum library.
 | |
| //
 | |
| // The go-ethereum library is free software: you can redistribute it and/or modify
 | |
| // it under the terms of the GNU Lesser General Public License as published by
 | |
| // the Free Software Foundation, either version 3 of the License, or
 | |
| // (at your option) any later version.
 | |
| //
 | |
| // The go-ethereum library is distributed in the hope that it will be useful,
 | |
| // but WITHOUT ANY WARRANTY; without even the implied warranty of
 | |
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | |
| // GNU Lesser General Public License for more details.
 | |
| //
 | |
| // You should have received a copy of the GNU Lesser General Public License
 | |
| // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 | |
| 
 | |
| package http
 | |
| 
 | |
| import (
 | |
| 	"io/ioutil"
 | |
| 	"net/http"
 | |
| 	"net/http/httptest"
 | |
| 	"os"
 | |
| 	"testing"
 | |
| 
 | |
| 	"github.com/ethereum/go-ethereum/swarm/api"
 | |
| 	"github.com/ethereum/go-ethereum/swarm/storage"
 | |
| 	"github.com/ethereum/go-ethereum/swarm/storage/feed"
 | |
| )
 | |
| 
 | |
| type TestServer interface {
 | |
| 	ServeHTTP(http.ResponseWriter, *http.Request)
 | |
| }
 | |
| 
 | |
| func NewTestSwarmServer(t *testing.T, serverFunc func(*api.API) TestServer, resolver api.Resolver) *TestSwarmServer {
 | |
| 	swarmDir, err := ioutil.TempDir("", "swarm-storage-test")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	storeParams := storage.NewDefaultLocalStoreParams()
 | |
| 	storeParams.DbCapacity = 5000000
 | |
| 	storeParams.CacheCapacity = 5000
 | |
| 	storeParams.Init(swarmDir)
 | |
| 	localStore, err := storage.NewLocalStore(storeParams, nil)
 | |
| 	if err != nil {
 | |
| 		os.RemoveAll(swarmDir)
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 	fileStore := storage.NewFileStore(localStore, storage.NewFileStoreParams())
 | |
| 	// Swarm feeds test setup
 | |
| 	feedsDir, err := ioutil.TempDir("", "swarm-feeds-test")
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	feeds, err := feed.NewTestHandler(feedsDir, &feed.HandlerParams{})
 | |
| 	if err != nil {
 | |
| 		t.Fatal(err)
 | |
| 	}
 | |
| 
 | |
| 	swarmApi := api.NewAPI(fileStore, resolver, feeds.Handler, nil)
 | |
| 	apiServer := httptest.NewServer(serverFunc(swarmApi))
 | |
| 
 | |
| 	tss := &TestSwarmServer{
 | |
| 		Server:    apiServer,
 | |
| 		FileStore: fileStore,
 | |
| 		dir:       swarmDir,
 | |
| 		Hasher:    storage.MakeHashFunc(storage.DefaultHash)(),
 | |
| 		cleanup: func() {
 | |
| 			apiServer.Close()
 | |
| 			fileStore.Close()
 | |
| 			feeds.Close()
 | |
| 			os.RemoveAll(swarmDir)
 | |
| 			os.RemoveAll(feedsDir)
 | |
| 		},
 | |
| 		CurrentTime: 42,
 | |
| 	}
 | |
| 	feed.TimestampProvider = tss
 | |
| 	return tss
 | |
| }
 | |
| 
 | |
| type TestSwarmServer struct {
 | |
| 	*httptest.Server
 | |
| 	Hasher      storage.SwarmHash
 | |
| 	FileStore   *storage.FileStore
 | |
| 	dir         string
 | |
| 	cleanup     func()
 | |
| 	CurrentTime uint64
 | |
| }
 | |
| 
 | |
| func (t *TestSwarmServer) Close() {
 | |
| 	t.cleanup()
 | |
| }
 | |
| 
 | |
| func (t *TestSwarmServer) Now() feed.Timestamp {
 | |
| 	return feed.Timestamp{Time: t.CurrentTime}
 | |
| }
 |