torrent uploading flag

engine/NetStart.go

@@ -91,6 +91,7 @@ func NetStart(s *state.State) {
 
 	// 	Torrent Plugin
 	tormanager := flag.Bool("tormanage", false, "Use torrent dbstate manager. Must have plugin binary installed and in $PATH")
+	torUploader := flag.Bool("torupload", false, "Be a torrent uploader")
 
 	flag.Parse()
 
@@ -539,6 +540,7 @@ func NetStart(s *state.State) {
 
 	// Initate dbstate plugin if enabled. Only does so for first node,
 	// any more nodes on sim control will use default method
+	fnodes[0].State.SetTorrentUploader(*torUploader)
 	if *tormanager {
 		fnodes[0].State.SetUseTorrent(true)
 		manager, err := LaunchDBStateManagePlugin(*pluginPath, fnodes[0].State.InMsgQueue(), fnodes[0].State, fnodes[0].State.GetServerPrivateKey(), *memProfileRate)

state/plugins.go

@@ -142,11 +142,20 @@ func (u *UploadController) handleErrors() {
 
 // Only called once to set the torrent flag.
 func (s *State) SetUseTorrent(setVal bool) {
-	s.useDBStateManager = setVal
+	s.useTorrents = setVal
 }
 
 func (s *State) UsingTorrent() bool {
-	return s.useDBStateManager
+	return s.useTorrents
+}
+
+// Only called once to set the torrent flag.
+func (s *State) SetTorrentUploader(setVal bool) {
+	s.torrentUploader = setVal
+}
+
+func (s *State) TorrentUploader() bool {
+	return s.torrentUploader
 }
 
 /*****************
@@ -221,7 +230,7 @@ func (s *State) uploadDBState(sequence uint32) error {
 			}
 			fullData = append(fullData, data...)
 		}
-		if s.IsLeader() {
+		if s.IsLeader() || s.TorrentUploader() {
 			err := s.DBStateManager.UploadDBStateBytes(fullData, true)
 			if err != nil {
 				return fmt.Errorf("[TorrentUpload] Torrent failed to upload: %s\n", err.Error())
@@ -248,4 +257,4 @@ func (s *State) SetUseEtcd(setVal bool) {
 
 func (s *State) UsingEtcd() bool {
 	return s.useEtcd
-}
+}

state/state.go

@@ -331,7 +331,8 @@ type State struct {
 	AckChange uint32
 
 	// Plugins
-	useDBStateManager       bool
+	useTorrents             bool
+	torrentUploader         bool
 	Uploader                *UploadController // Controls the uploads of torrents. Prevents backups
 	DBStateManager          interfaces.IManagerController
 	HighestCompletedTorrent uint32

state/torrentSync.go

@@ -23,7 +23,7 @@ func (s *State) StartTorrentSyncing() error {
 	var done uint32 = 0
 	for {
 		// Leaders do not need to sync torrents, they need to upload
-		if s.IsLeader() {
+		if s.IsLeader() || s.TorrentUploader() {
 			// If we have not uploaded a height we have completed, increment done and upload
 			if done < s.EntryDBHeightComplete {
 				for done < s.EntryDBHeightComplete {