projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
7478: Fixes GCE driver's arvados_node_size tag handling.
[arvados.git]
/
services
/
keepstore
/
keepstore.go
diff --git
a/services/keepstore/keepstore.go
b/services/keepstore/keepstore.go
index 06a26984d002ad3cbe9372cdaaad2a651b998990..79e3017d55a8f7e108ee8d6b2d7effc3950a7260 100644
(file)
--- a/
services/keepstore/keepstore.go
+++ b/
services/keepstore/keepstore.go
@@
-8,7
+8,6
@@
import (
"flag"
"fmt"
"net"
"flag"
"fmt"
"net"
- "net/http"
"os"
"os/signal"
"syscall"
"os"
"os/signal"
"syscall"
@@
-16,9
+15,7
@@
import (
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/config"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/config"
- "git.curoverse.com/arvados.git/sdk/go/httpserver"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
- log "github.com/Sirupsen/logrus"
"github.com/coreos/go-systemd/daemon"
)
"github.com/coreos/go-systemd/daemon"
)
@@
-105,8
+102,8
@@
func main() {
// Print version information if requested
if *getVersion {
// Print version information if requested
if *getVersion {
- fmt.Printf("
Version:
%s\n", version)
- os.Exit(0)
+ fmt.Printf("
keepstore
%s\n", version)
+ return
}
deprecated.afterFlagParse(theConfig)
}
deprecated.afterFlagParse(theConfig)
@@
-120,7
+117,7
@@
func main() {
log.Fatal(config.DumpAndExit(theConfig))
}
log.Fatal(config.DumpAndExit(theConfig))
}
- log.Printf("keepstore %
q
started", version)
+ log.Printf("keepstore %
s
started", version)
err = theConfig.Start()
if err != nil {
err = theConfig.Start()
if err != nil {
@@
-158,11
+155,8
@@
func main() {
// Start a round-robin VolumeManager with the volumes we have found.
KeepVM = MakeRRVolumeManager(theConfig.Volumes)
// Start a round-robin VolumeManager with the volumes we have found.
KeepVM = MakeRRVolumeManager(theConfig.Volumes)
- // Middleware
stack: logger, MaxRequests limiter, method handlers
+ // Middleware
/handler stack
router := MakeRESTRouter()
router := MakeRESTRouter()
- limiter := httpserver.NewRequestLimiter(theConfig.MaxRequests, router)
- router.limiter = limiter
- http.Handle("/", &LoggingRESTRouter{router: limiter})
// Set up a TCP listener.
listener, err := net.Listen("tcp", theConfig.Listen)
// Set up a TCP listener.
listener, err := net.Listen("tcp", theConfig.Listen)
@@
-170,19
+164,23
@@
func main() {
log.Fatal(err)
}
log.Fatal(err)
}
- // Initialize
Pull queue and worker
+ // Initialize
keepclient for pull workers
keepClient := &keepclient.KeepClient{
Arvados: &arvadosclient.ArvadosClient{},
Want_replicas: 1,
}
keepClient := &keepclient.KeepClient{
Arvados: &arvadosclient.ArvadosClient{},
Want_replicas: 1,
}
- // Initialize the pullq and worker
+ // Initialize the pullq and worker
s
pullq = NewWorkQueue()
pullq = NewWorkQueue()
- go RunPullWorker(pullq, keepClient)
+ for i := 0; i < 1 || i < theConfig.PullWorkers; i++ {
+ go RunPullWorker(pullq, keepClient)
+ }
- // Initialize the trashq and worker
+ // Initialize the trashq and worker
s
trashq = NewWorkQueue()
trashq = NewWorkQueue()
- go RunTrashWorker(trashq)
+ for i := 0; i < 1 || i < theConfig.TrashWorkers; i++ {
+ go RunTrashWorker(trashq)
+ }
// Start emptyTrash goroutine
doneEmptyingTrash := make(chan bool)
// Start emptyTrash goroutine
doneEmptyingTrash := make(chan bool)
@@
-204,7
+202,8
@@
func main() {
log.Printf("Error notifying init daemon: %v", err)
}
log.Println("listening at", listener.Addr())
log.Printf("Error notifying init daemon: %v", err)
}
log.Println("listening at", listener.Addr())
- srv := &http.Server{}
+ srv := &server{}
+ srv.Handler = router
srv.Serve(listener)
}
srv.Serve(listener)
}