Browse Source

Revert "Revert "fix(server): only set NOCOW for log file""

This reverts commit 9540575690db92a362f66d9aa4f2671265b87eb1.

Conflicts:
	etcd/etcd.go
Yicheng Qin 11 years ago
parent
commit
79a89dcb82
2 changed files with 6 additions and 5 deletions
  1. 0 5
      etcd/etcd.go
  2. 6 0
      server/peer_server.go

+ 0 - 5
etcd/etcd.go

@@ -103,11 +103,6 @@ func (e *Etcd) Run() {
 		log.Warnf("All cached configuration is now ignored. The file %s can be removed.", info)
 	}
 
-	// Set NOCOW for data directory in btrfs
-	if btrfs.IsBtrfs(e.Config.DataDir) {
-		btrfs.SetNOCOWDir(e.Config.DataDir)
-	}
-
 	var mbName string
 	if e.Config.Trace() {
 		mbName = e.Config.MetricsBucketName()

+ 6 - 0
server/peer_server.go

@@ -19,6 +19,7 @@ import (
 	etcdErr "github.com/coreos/etcd/error"
 	"github.com/coreos/etcd/log"
 	"github.com/coreos/etcd/metrics"
+	"github.com/coreos/etcd/pkg/btrfs"
 	"github.com/coreos/etcd/store"
 )
 
@@ -291,6 +292,11 @@ func (s *PeerServer) Start(snapshot bool, discoverURL string, peers []string) er
 
 	s.raftServer.Init()
 
+	// Set NOCOW for data directory in btrfs
+	if btrfs.IsBtrfs(s.raftServer.LogPath()) {
+		btrfs.SetNOCOW(s.raftServer.LogPath())
+	}
+
 	s.findCluster(discoverURL, peers)
 
 	s.closeChan = make(chan bool)