cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Merge pull request #4107 from shaodan/worker-no-swap

Browse Source 
Add --no-swap flag for worker
This commit is contained in:
Łukasz Magiera 2020-09-30 09:25:57 +02:00 committed by GitHub
commit bc85e3ce50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/lotus-seal-worker/main.go
View File

@ -109,6 +109,11 @@ var runCmd = &cli.Command{
Name: "no-local-storage", Name: "no-local-storage",
Usage: "don't use storageminer repo for sector storage", Usage: "don't use storageminer repo for sector storage",
}, },
&cli.BoolFlag{
Name: "no-swap",
Usage: "don't use swap",
Value: false,
},
&cli.BoolFlag{ &cli.BoolFlag{
Name: "addpiece", Name: "addpiece",
Usage: "enable addpiece", Usage: "enable addpiece",
@ -346,6 +351,7 @@ var runCmd = &cli.Command{
LocalWorker: sectorstorage.NewLocalWorker(sectorstorage.WorkerConfig{ LocalWorker: sectorstorage.NewLocalWorker(sectorstorage.WorkerConfig{
SealProof: spt, SealProof: spt,
TaskTypes: taskTypes, TaskTypes: taskTypes,
NoSwap: cctx.Bool("no-swap"),
}, remote, localStore, nodeApi), }, remote, localStore, nodeApi),
localStore: localStore, localStore: localStore,
ls: lr, ls: lr,
@ -465,6 +471,7 @@ func watchMinerConn(ctx context.Context, cctx *cli.Context, nodeApi api.StorageM
"run", "run",
fmt.Sprintf("--listen=%s", cctx.String("listen")), fmt.Sprintf("--listen=%s", cctx.String("listen")),
fmt.Sprintf("--no-local-storage=%t", cctx.Bool("no-local-storage")), fmt.Sprintf("--no-local-storage=%t", cctx.Bool("no-local-storage")),
fmt.Sprintf("--no-swap=%t", cctx.Bool("no-swap")),
fmt.Sprintf("--addpiece=%t", cctx.Bool("addpiece")), fmt.Sprintf("--addpiece=%t", cctx.Bool("addpiece")),
fmt.Sprintf("--precommit1=%t", cctx.Bool("precommit1")), fmt.Sprintf("--precommit1=%t", cctx.Bool("precommit1")),
fmt.Sprintf("--unseal=%t", cctx.Bool("unseal")), fmt.Sprintf("--unseal=%t", cctx.Bool("unseal")),

10
extern/sector-storage/localworker.go vendored
View File

@ -26,6 +26,7 @@ var pathTypes = []stores.SectorFileType{stores.FTUnsealed, stores.FTSealed, stor
type WorkerConfig struct { type WorkerConfig struct {
SealProof abi.RegisteredSealProof SealProof abi.RegisteredSealProof
TaskTypes []sealtasks.TaskType TaskTypes []sealtasks.TaskType
NoSwap bool
} }
type LocalWorker struct { type LocalWorker struct {
@ -33,6 +34,7 @@ type LocalWorker struct {
storage stores.Store storage stores.Store
localStore *stores.Local localStore *stores.Local
sindex stores.SectorIndex sindex stores.SectorIndex
noSwap bool
acceptTasks map[sealtasks.TaskType]struct{} acceptTasks map[sealtasks.TaskType]struct{}
} }
@ -50,6 +52,7 @@ func NewLocalWorker(wcfg WorkerConfig, store stores.Store, local *stores.Local,
storage: store, storage: store,
localStore: local, localStore: local,
sindex: sindex, sindex: sindex,
noSwap: wcfg.NoSwap,
acceptTasks: acceptTasks, acceptTasks: acceptTasks,
} }
@ -275,11 +278,16 @@ func (l *LocalWorker) Info(context.Context) (storiface.WorkerInfo, error) {
return storiface.WorkerInfo{}, xerrors.Errorf("getting memory info: %w", err) return storiface.WorkerInfo{}, xerrors.Errorf("getting memory info: %w", err)
} }
memSwap := mem.VirtualTotal
if l.noSwap {
memSwap = 0
}
return storiface.WorkerInfo{ return storiface.WorkerInfo{
Hostname: hostname, Hostname: hostname,
Resources: storiface.WorkerResources{ Resources: storiface.WorkerResources{
MemPhysical: mem.Total, MemPhysical: mem.Total,
MemSwap: mem.VirtualTotal, MemSwap: memSwap,
MemReserved: mem.VirtualUsed + mem.Total - mem.Available, // TODO: sub this process MemReserved: mem.VirtualUsed + mem.Total - mem.Available, // TODO: sub this process
CPUs: uint64(runtime.NumCPU()), CPUs: uint64(runtime.NumCPU()),
GPUs: gpus, GPUs: gpus,