Merge branch 'release-1.16.9' into stable

ci/ansible/tasks/files/usr/bin/resetswift

@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+
+/usr/bin/unmount_and_stop_pfs
+echo "Resetting Swift drives..."
+rm -rf /srv/?/node/d?/*
+echo "Resetting Swift logs..."
+sudo find /var/log/swift -type f -exec truncate {} --size 0 \;
+/usr/bin/start_and_mount_pfs "$@"

ci/ansible/tasks/main.yml

@@ -275,6 +275,14 @@
       group: root
       mode: '0755'
 
+  - name: Reset Swift script
+    copy:
+      src: usr/bin/resetswift
+      dest: /usr/bin/resetswift
+      owner: root
+      group: root
+      mode: '0755'
+
   - name: Install 3 versions of Golang (current, candidate, and latest)
     block:
 

ci/ansible/tasks/templates/usr/bin/reprovision_proxyfs.template

@@ -4,4 +4,4 @@ set -e
 /usr/bin/unmount_and_stop_pfs
 cd $GOPATH/src/github.com/swiftstack/ProxyFS
 ci/ansible/install_proxyfs.sh {{ env_arg }} {{ ss_packages_arg }} {{ active_golang_version }}
-/usr/bin/start_and_mount_pfs
+/usr/bin/start_and_mount_pfs "$@"

conf/api.go

@@ -360,10 +360,10 @@ func (confMap ConfMap) Dump() (confMapString string) {
 		confSectionNameSliceIndex int
 	)
 
-	// 1 Mibyte should be more than enough to hold the confMap so get the
+	// 2 Mibyte should be more than enough to hold the confMap so get the
 	// memory in 1 allocation
 	var buf strings.Builder
-	buf.Grow(1024 * 1024)
+	buf.Grow(2 * 1024 * 1024)
 
 	confSectionNameSlice = make([]string, 0, len(confMap))
 

inode/cache.go

@@ -53,8 +53,9 @@ func adoptVolumeGroupReadCacheParameters(confMap conf.ConfMap) (err error) {
 
 			readCacheLineCount = readCacheTotalSize / volumeGroup.readCacheLineSize
 			if 0 == readCacheLineCount {
-				err = fmt.Errorf("[VolumeGroup:%s]ReadCacheWeight must result in at least one ReadCacheLineSize (%v) of memory", volumeGroup.name, volumeGroup.readCacheLineSize)
-				return
+				logger.Infof("Computed 0 ReadCacheLines for Volume Group %v; increasing to 1",
+					volumeGroup.name)
+				readCacheLineCount = 1
 			}
 
 			volumeGroup.Lock()

liveness/config.go

@@ -156,8 +156,8 @@ type globalsStruct struct {
 	swiftConfDir                   string
 	swiftReconChecksPerConfCheck   uint64
 	swiftReconChecksUntilConfCheck uint64
-	swiftConfFileMap               map[string]time.Time // Key == os.FileInfo.Name(); Value == os.FileInfo.ModTime()
-	swiftReconEndpointSet          map[string]struct{}  // Key == IPAddrPort of ReconEndpoint
+	swiftConfFileMap               map[string]time.Time //          Key == os.FileInfo.Name(); Value == os.FileInfo.ModTime()
+	swiftReconEndpointSet          map[string]struct{}  //          Key == IPAddrPort of ReconEndpoint
 	crc64ECMATable                 *crc64.Table
 	nextNonce                      uint64 //                        Randomly initialized... skips 0
 	recvMsgsDoneChan               chan struct{}
@@ -175,11 +175,11 @@ type globalsStruct struct {
 	stateMachineStopChan           chan struct{}
 	stateMachineDone               sync.WaitGroup
 	livenessCheckerControlChan     chan bool //                     Send true  to trigger livenessChecker() to recompute polling schedule
-	//                                                          Send false to trigger livenessChecker() to exit
+	//                                                              Send false to trigger livenessChecker() to exit
 	livenessCheckerWG          sync.WaitGroup
 	volumeToCheckList          []*volumeStruct
-	emptyVolumeGroupToCheckSet map[string]string   //           List (in "set" form) of VolumeGroups (by name) with no Volumes (Value == ServingPeer)
-	emptyServingPeerToCheckSet map[string]struct{} //           List (in "set" form) of ServingPeers (by name) with no VolumeGroups
+	emptyVolumeGroupToCheckSet map[string]string   //               List (in "set" form) of VolumeGroups (by name) with no Volumes (Value == ServingPeer)
+	emptyServingPeerToCheckSet map[string]struct{} //               List (in "set" form) of ServingPeers (by name) with no VolumeGroups
 	myObservingPeerReport      *internalObservingPeerReportStruct
 	livenessReport             *internalLivenessReportStruct
 	curRWMode                  inode.RWModeType

liveness/polling.go

@@ -58,7 +58,6 @@ func livenessChecker() {
 		entityToCheck                   *list.Element
 		err                             error
 		livenessCheckerControlChanValue bool
-		myObservingPeerReport           *internalObservingPeerReportStruct
 		reconEndpoint                   *internalReconEndpointReportStruct
 		servingPeer                     *internalServingPeerReportStruct
 		volume                          *internalVolumeReportStruct
@@ -67,11 +66,10 @@ func livenessChecker() {
 
 	for {
 		globals.Lock()
-		myObservingPeerReport = globals.myObservingPeerReport
-		globals.Unlock()
 
-		if nil == myObservingPeerReport {
+		if nil == globals.myObservingPeerReport {
 			// Just wait to be signaled to check again... or exit
+			globals.Unlock()
 			livenessCheckerControlChanValue = <-globals.livenessCheckerControlChan
 			if livenessCheckerControlChanValue {
 				// Just loop back and re-check globals.myObservingPeerReport
@@ -80,15 +78,16 @@ func livenessChecker() {
 				globals.livenessCheckerWG.Done()
 				return
 			}
-		} else { // nil != myObservingPeerReport
+		} else { // nil != globals.myObservingPeerReport
 			// Check to see if we are supposed to exit
 
 			select {
 			case livenessCheckerControlChanValue = <-globals.livenessCheckerControlChan:
 				if livenessCheckerControlChanValue {
-					// Just loop back and re-check globals.myObservingPeerReport
+					// Just fall into checkEntityList processing
 				} else {
 					// Exit
+					globals.Unlock()
 					globals.livenessCheckerWG.Done()
 					return
 				}
@@ -100,7 +99,7 @@ func livenessChecker() {
 
 			checkEntityList = list.New()
 
-			for _, servingPeer = range myObservingPeerReport.servingPeer {
+			for _, servingPeer = range globals.myObservingPeerReport.servingPeer {
 				_ = checkEntityList.PushBack(servingPeer)
 
 				for _, volumeGroup = range servingPeer.volumeGroup {
@@ -112,10 +111,12 @@ func livenessChecker() {
 				}
 			}
 
-			for _, reconEndpoint = range myObservingPeerReport.reconEndpoint {
+			for _, reconEndpoint = range globals.myObservingPeerReport.reconEndpoint {
 				_ = checkEntityList.PushBack(reconEndpoint)
 			}
 
+			globals.Unlock()
+
 			utils.RandomizeList(checkEntityList)
 
 			// Compute number of entities to check & time between each check

logger/config.go

@@ -97,7 +97,7 @@ func openLogFile(confMap conf.ConfMap) (err error) {
 	if logFilePath != "" {
 		logFile, err = os.OpenFile(logFilePath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 		if err != nil {
-			log.Errorf("couldn't open log file: %v", err)
+			log.Errorf("couldn't open log file '%s': %v", logFilePath, err)
 			return err
 		}
 	}
@@ -131,7 +131,7 @@ func openLogFile(confMap conf.ConfMap) (err error) {
 	debugConfSlice, _ := confMap.FetchOptionValueStringSlice("Logging", "DebugLevelLogging")
 	setDebugLoggingLevel(debugConfSlice)
 
-	Infof("logger opened logfile (PID %d)", os.Getpid())
+	Infof("logger opened logfile '%s' (PID %d)", logFilePath, os.Getpid())
 	return
 }
 
@@ -184,10 +184,11 @@ func SignaledStart(confMap conf.ConfMap) (err error) {
 
 func SignaledFinish(confMap conf.ConfMap) (err error) {
 
-	Infof("logger is closing and reopening logfile (PID %d)", os.Getpid())
+	Infof("logger is closing logfile (PID %d)", os.Getpid())
 	err = closeLogFile(confMap)
 	if nil == err {
 		err = openLogFile(confMap)
+		Infof("logger opened logfile (PID %d)", os.Getpid())
 	}
 	return
 }

pfs_middleware/tox.ini

@@ -7,7 +7,7 @@ usedevelop = True
 deps =
     lint: flake8
     !lint: -r{toxinidir}/test-requirements.txt
-    release: git+git://github.com/swiftstack/[email protected].4
+    release: git+git://github.com/swiftstack/[email protected].5
     minver: http://tarballs.openstack.org/swift/swift-2.9.0.tar.gz
     master: http://tarballs.openstack.org/swift/swift-master.tar.gz
 commands = python -m unittest discover

pfsagentd/README.md

@@ -64,8 +64,8 @@ HTTPServerIPAddr:                                       0.0.0.0
 HTTPServerTCPPort:                                         9090
 ReadDirPlusEnabled:                                       false
 XAttrEnabled:                                             false
-EntryDuration:                                              10s
-AttrDuration:                                               10s
+EntryDuration:                                               0s
+AttrDuration:                                                0s
 AttrBlockSize:                                            65536
 ReaddirMaxEntries:                                         1024
 FUSEMaxBackground:                                          100