Merge branch 'release-1.18.0' into stable

NVIDIA · Jan 22, 2021 · 1615828 · 1615828
2 parents 6122a06 + 3b1944c
commit 1615828
Show file tree

Hide file tree

Showing 8,765 changed files with 4,944 additions and 3,399,382 deletions.
diff --git a/CONFIGURING.md b/CONFIGURING.md
@@ -77,6 +77,7 @@ For each of the keys supported, the following table will list whether or not its
 |                                           | HeartBeatMissLimit                       | No           | 3                  | Yes                      | No                           |
 |                                           | MessageQueueDepthPerPeer                 | No           | 4                  | Yes                      | No                           |
 |                                           | MaxRequestDuration                       | No           | 1s                 | Yes                      | No                           |
+|                                           | LivenessCheckerEnabled                   | No           | false              | Yes                      | Yes                          |
 |                                           | LivenessCheckRedundancy                  | No           | 2                  | Yes                      | No                           |
 |                                           | LogLevel                                 | No           | <i>None</i>        | Yes                      | No                           |
 | Peer:<i>PeerName</i>                      | PublicIPAddr                             | Yes          |                    | Yes                      | Yes but WhoAmI should remain |
@@ -109,6 +110,7 @@ For each of the keys supported, the following table will list whether or not its
 |                                           | TryLockBackoffMax                        | No           | 50ms               | Yes                      | No                           |
 |                                           | TryLockSerializationThreshhold           | No           | 5                  | Yes                      | No                           |
 |                                           | SymlinkMax                               | No           | 32                 | Yes                      | No                           |
+|                                           | CoalesceElementChunkSize                 | No           | 16                 | Yes                      | No                           |
 |                                           | InodeRecCacheEvictLowLimit               | Yes          |                    | Yes                      | No                           |
 |                                           | InodeRecCacheEvictHighLimit              | Yes          |                    | Yes                      | No                           |
 |                                           | LogSegmentRecCacheEvictLowLimit          | Yes          |                    | Yes                      | No                           |

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1 +1 @@
-Copyright 2015-present, SwiftStack and the ProxyFS contributors
+Copyright (c) 2015-2021, NVIDIA CORPORATION.
diff --git a/GLIDE.md b/GLIDE.md
diff --git a/GoMakefile b/GoMakefile
@@ -1,3 +1,6 @@
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
 # GoMakefile is a template to be included by Go package Makefile's in this repo
 
 all: version fmt generate install test

diff --git a/Makefile b/Makefile
@@ -1,3 +1,6 @@
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
 gopregeneratesubdirs = \
 	make-static-content
 
@@ -188,7 +191,7 @@ pfsagent-install:
 
 pre-generate:
 	@set -e; \
-	go install github.com/swiftstack/ProxyFS/vendor/golang.org/x/tools/cmd/stringer; \
+	go install golang.org/x/tools/cmd/stringer; \
 	for gosubdir in $(gopregeneratesubdirs); do \
 		$(MAKE) --no-print-directory -C $$gosubdir install; \
 	done

diff --git a/bin/autodoc b/bin/autodoc
@@ -1,18 +1,8 @@
 #!/usr/bin/env python
-# Copyright (c) 2015 SwiftStack, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
 
 import argparse
 import os

diff --git a/bin/aws-multipart-test.py b/bin/aws-multipart-test.py
@@ -1,20 +1,7 @@
 #!/usr/bin/env python
-
-#
-# Copyright (c) 2019 SwiftStack, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
 #
 
 #

diff --git a/bin/cleanswift b/bin/cleanswift
@@ -1,18 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2015 SwiftStack, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
 
 swift-init all stop
 find /var/log/swift -type f -delete

diff --git a/bin/pfs_stat b/bin/pfs_stat
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
 import json
 import os.path
 import re

diff --git a/bin/profile-proxyfsd.py b/bin/profile-proxyfsd.py
@@ -1,5 +1,8 @@
 #!/usr/bin/env python2.7
 #
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+#
 # Collect periodic heap profiles from proxyfsd using the
 # HTTP interface.  This requies that proxyfsd be compiled with the
 # patch included below.

diff --git a/bin/proxyfsd-getprofile b/bin/proxyfsd-getprofile
@@ -1,5 +1,8 @@
 #!/usr/bin/bash
 #
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+#
 # Collect periodic heap profiles from proxyfsd using the 
 # HTTP interface.  This requies that proxyfsd be compiled with the
 # patch included below.

diff --git a/bin/rebuildswift b/bin/rebuildswift
@@ -1,18 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2015 SwiftStack, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
 
 /vagrant/bin/cleanswift
 rm -fr /etc/swift/*

diff --git a/bin/reinstallswift b/bin/reinstallswift
@@ -1,18 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2015 SwiftStack, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
 
 set -e
 cd /tmp/vagrant-chef*/

diff --git a/bin/remakerings b/bin/remakerings
@@ -1,18 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2015 SwiftStack, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
 
 rm -f /etc/swift/*.builder /etc/swift/*.ring.gz \
   /etc/swift/backups/*.builder /etc/swift/backups/*.ring.gz

diff --git a/bin/resetswift b/bin/resetswift
@@ -1,18 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2015 SwiftStack, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
 
 /vagrant/bin/cleanswift
 cd /tmp/vagrant-chef*/ && sudo chef-solo -c solo.rb -j dna.json -o swift::data

diff --git a/bin/space.sh b/bin/space.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 #
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+#
 # Outputs:
 #   VmSize (kB) sum for all smbd and proxyfsd processes on this node
 #   Disk space used (in 1K-blocks) by all Swift devices on this node

diff --git a/bin/vmspace.sh b/bin/vmspace.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 #
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+#
 # Output:
 #   VmSize (kB) sum for all smbd and proxyfsd processes on this node
 

diff --git a/bin/vtox b/bin/vtox
@@ -1,18 +1,7 @@
 #!/bin/bash
-# Copyright (c) 2015 SwiftStack, Inc.
 #
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-# implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
 
 # tox wrapper for vagrant
 ARGS=${@:-"-e pep8,py27"}

diff --git a/blunder/Makefile b/blunder/Makefile
@@ -1,3 +1,6 @@
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
 gosubdir := github.com/swiftstack/ProxyFS/blunder
 
 generatedfiles := \

diff --git a/blunder/api.go b/blunder/api.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 // Package blunder provides error-handling wrappers
 //
 // These wrappers allow callers to provide additional information in Go errors

diff --git a/blunder/api_test.go b/blunder/api_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 package blunder
 
 import (
@@ -36,6 +39,7 @@ func testSetup(t *testing.T) {
 		"FSGlobals.TryLockBackoffMax=50ms",
 		"FSGlobals.TryLockSerializationThreshhold=5",
 		"FSGlobals.SymlinkMax=32",
+		"FSGlobals.CoalesceElementChunkSize=16",
 	}
 
 	testConfMap, err = conf.MakeConfMapFromStrings(testConfStrings)

diff --git a/bucketstats/Makefile b/bucketstats/Makefile
@@ -1,3 +1,6 @@
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
 gosubdir := github.com/swiftstack/ProxyFS/bucketstats
 
 include ../GoMakefile
diff --git a/bucketstats/api.go b/bucketstats/api.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 // Package bucketstats implements easy to use statistics collection and
 // reporting, including bucketized statistics.  Statistics start at zero and
 // grow as they are added to.

diff --git a/bucketstats/api_test.go b/bucketstats/api_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 package bucketstats
 
 import (

diff --git a/bucketstats/atomic_darwin.go b/bucketstats/atomic_darwin.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 package bucketstats
 
 import (

diff --git a/bucketstats/atomic_linux_amd64.go b/bucketstats/atomic_linux_amd64.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 package bucketstats
 
 import (

diff --git a/bucketstats/atomic_linux_arm.go b/bucketstats/atomic_linux_arm.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 // Per bugs in the 32-bit versions of 64-bit sync/atomic API implementations,
 // this file implements those operations by means of a global lock.
 

diff --git a/bucketstats/impl.go b/bucketstats/impl.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 // The bucketstats Package implements convenient, easy to use, bucketized
 // statistics.
 

diff --git a/bucketstats/tables.go b/bucketstats/tables.go
@@ -1,3 +1,6 @@
+// Copyright (c) 2015-2021, NVIDIA CORPORATION.
+// SPDX-License-Identifier: Apache-2.0
+
 // The bucketstats Package implements convenient, easy to use, bucketized
 // statistics.
 

diff --git a/ci/ansible/check_pinned_packages b/ci/ansible/check_pinned_packages
@@ -1,5 +1,8 @@
 #!/usr/bin/env python
 
+# Copyright (c) 2015-2021, NVIDIA CORPORATION.
+# SPDX-License-Identifier: Apache-2.0
+
 import json
 import os
 import subprocess

diff --git a/ci/ansible/chef_files/packages/rhel_ss.json b/ci/ansible/chef_files/packages/rhel_ss.json
@@ -3,12 +3,12 @@
     ["ss-samba", "4.6.2-3.el7"]
   ],
   "samba_deps": [
-    ["gcc", "4.8.5-39.el7"],
-    ["gcc-c++", "4.8.5-39.el7"],
-    ["python-devel", "2.7.5-88.el7"],
+    ["gcc", "4.8.5-44.el7"],
+    ["gcc-c++", "4.8.5-44.el7"],
+    ["python-devel", "2.7.5-90.el7"],
     ["gnutls-devel", "3.3.29-9.el7_6"],
     ["libacl-devel", "2.2.51-15.el7"],
-    ["openldap-devel", "2.4.44-21.el7_6"],
+    ["openldap-devel", "2.4.44-22.el7"],
     ["cifs-utils", "6.2-10.el7"],
     ["pam-devel", "1.1.8-23.el7"]
   ],
@@ -24,10 +24,10 @@
     ["sshpass"]
   ],
   "nfs_packages": [
-    ["nfs-utils", "1.3.0-0.66.el7"]
+    ["nfs-utils", "1.3.0-0.68.el7"]
   ],
   "gdb_packages": [
-    ["gdb", "7.6.1-119.el7"],
+    ["gdb", "7.6.1-120.el7"],
     ["yum-utils"]
   ],
   "utils_packages": [
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Copyright 2015-present, SwiftStack and the ProxyFS contributors
		Copyright (c) 2015-2021, NVIDIA CORPORATION.