Merge pull request #2262 from jhiemstrawisc/issue-2260

Bump xrdcl-pelican version to v1.2.1

Author: turetske

client/fed_long_test.go

@@ -28,6 +28,7 @@ import (
 	"os"
 	"path/filepath"
 	"strconv"
+	"strings"
 	"testing"
 	"time"
 
@@ -810,6 +811,21 @@ func TestSyncDownload(t *testing.T) {
 		require.NoError(t, err)
 		require.Len(t, transferDetailsDownload, 1)
 
+		// After the introduction of E2E client checksumming, this test started to break on the final
+		// direct read download. As best we can currently figure, this happens because the subsequent
+		// DoPut call overwrites the file without overwriting the files xattrs, where the checksum is
+		// stored. This causes the final directread DoGet to grab a file with a stale checksum. As a
+		// workaround until this issue can be resolved in the upstream XRootD operation, we manually
+		// delete the file from the Origin to force a rewrite of the xattrs checksum.
+		var originLocation string
+		for _, export := range fed.Exports {
+			if strings.Contains(export.FederationPrefix, "/first/namespace") {
+				originLocation = export.StoragePrefix
+				break
+			}
+		}
+		require.NoError(t, os.Remove(filepath.Join(originLocation, fmt.Sprintf("sync_download_partial/%s/%s/%s", dirName, filepath.Base(innerTempDir), filepath.Base(innerTempFile.Name())))))
+
 		// Change the contents of one already-uploaded file and re-upload it.
 		// Filesize is the same so a re-download should be skipped.
 		newTestFileContent := "XXXX content is within another XXXX"

github_scripts/osx_install.sh

@@ -31,12 +31,13 @@ mkdir dependencies
 pushd dependencies
 
 # Install scitokens first, which our xrootd build relies on
-git clone --depth=1 https://github.com/scitokens/scitokens-cpp.git
+git clone https://github.com/scitokens/scitokens-cpp.git
 pushd scitokens-cpp
+git checkout v1.1.3
 mkdir build
 cd build
 export SCITOKENS_CPP_DIR=$PWD/release_dir
-cmake .. -GNinja -DCMAKE_INSTALL_PREFIX="$PWD/release_dir"
+cmake .. -GNinja -DCMAKE_INSTALL_PREFIX="$PWD/release_dir" -DSCITOKENS_BUILD_UNITTESTS=OFF
 ninja install
 sudo ln -s "$PWD"/release_dir/lib/libSciTokens*.dylib /usr/local/lib
 popd
@@ -53,7 +54,7 @@ ninja
 ninja install
 popd
 
-git clone --branch v1.0.5 https://github.com/PelicanPlatform/xrdcl-pelican.git
+git clone --branch v1.2.1 https://github.com/PelicanPlatform/xrdcl-pelican.git
 pushd xrdcl-pelican
 mkdir build
 cd build

images/Dockerfile

@@ -54,7 +54,7 @@ ARG NODEJS_VER=20
 ARG LOTMAN_SRC_BUILD=false
 ARG LOTMAN_VER=0.0.4
 ARG XRDCL_PELICAN_SRC_BUILD=false
-ARG XRDCL_PELICAN_VER=1.0.5
+ARG XRDCL_PELICAN_VER=1.2.1
 ARG XRDHTTP_PELICAN_SRC_BUILD=false
 ARG XRDHTTP_PELICAN_VER=0.0.6
 ARG XROOTD_LOTMAN_SRC_BUILD=false