Skip to content

Commit

Permalink
Update xrootd to 5.7.0 and drop many patches (SOFTWARE-5925)
Browse files Browse the repository at this point in the history
git-svn-id: https://vdt.cs.wisc.edu/svn/native/redhat/branches/23-main@27960 4e558342-562e-0410-864c-e07659590f8c
  • Loading branch information
matyasselmeci committed Jul 2, 2024
1 parent 161f330 commit c61d11a
Show file tree
Hide file tree
Showing 10 changed files with 29 additions and 1,222 deletions.
32 changes: 17 additions & 15 deletions xrootd/osg/1868-env-hostname-override.patch
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ index ccfcd4f4fd8..e9a5d98781e 100644
//
if (HostName) free(HostName);

From 24eb035b63056f39250fddba8698b8a29c0d8aad Mon Sep 17 00:00:00 2001
From f2ac76bbb055a083a518c9007a7571ad68bd5449 Mon Sep 17 00:00:00 2001
From: Brian Bockelman <[email protected]>
Date: Thu, 22 Dec 2022 09:21:00 -0600
Subject: [PATCH 4/5] Give cmsd the concept of a 'public hostname'
Expand All @@ -255,10 +255,10 @@ properly registered.
4 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/src/XrdCms/XrdCmsCluster.cc b/src/XrdCms/XrdCmsCluster.cc
index 7649ebdde6e..428a548d7d9 100644
index 9d7a0f3..2709013 100644
--- a/src/XrdCms/XrdCmsCluster.cc
+++ b/src/XrdCms/XrdCmsCluster.cc
@@ -556,8 +556,7 @@ XrdCmsSelected *XrdCmsCluster::List(SMask_t mask, CmsLSOpts opts, bool &oksel)
@@ -557,8 +557,7 @@ XrdCmsSelected *XrdCmsCluster::List(SMask_t mask, CmsLSOpts opts, bool &oksel)
}
}
sip = new XrdCmsSelected(sipp);
Expand All @@ -268,16 +268,16 @@ index 7649ebdde6e..428a548d7d9 100644
else if (nP->myNlen >= XrdCmsSelected::IdentSize) destLen = 0;
else {strcpy(sip->Ident, nP->myName); destLen = nP->myNlen;}
if (!destLen) {delete sip; continue;}
@@ -1116,7 +1115,7 @@ int XrdCmsCluster::Select(SMask_t pmask, int &port, char *hbuff, int &hlen,
if (isMulti || baseFS.isDFS())
{STMutex.ReadLock();
nP = (Config.sched_RR ? SelbyRef(pmask,selR) : SelbyLoad(pmask,selR));
@@ -1120,7 +1119,7 @@ int XrdCmsCluster::Select(SMask_t pmask, int &port, char *hbuff, int &hlen,
: Config.sched_LoadR == 0 ? SelbyLoad(pmask,selR)
: SelbyLoadR(pmask, selR));

- if (nP) hlen = nP->netIF.GetName(hbuff, port, nType) + 1;
+ if (nP) hlen = nP->netIF.GetPublicName(hbuff, port) + 1;
else hlen = 0;
STMutex.UnLock();
return hlen != 1;
@@ -1147,7 +1146,7 @@ int XrdCmsCluster::Select(SMask_t pmask, int &port, char *hbuff, int &hlen,
@@ -1151,7 +1150,7 @@ int XrdCmsCluster::Select(SMask_t pmask, int &port, char *hbuff, int &hlen,
// At this point either we have a node or we do not
//
if (nP)
Expand All @@ -286,7 +286,7 @@ index 7649ebdde6e..428a548d7d9 100644
nP->RefR++;
STMutex.UnLock();
return hlen != 1;
@@ -1626,7 +1625,7 @@ int XrdCmsCluster::SelNode(XrdCmsSelect &Sel, SMask_t pmask, SMask_t amask)
@@ -1632,7 +1631,7 @@ int XrdCmsCluster::SelNode(XrdCmsSelect &Sel, SMask_t pmask, SMask_t amask)
//
if (nP)
{nP->g2nLock(STMutex);
Expand All @@ -295,7 +295,7 @@ index 7649ebdde6e..428a548d7d9 100644
if (!Sel.Resp.DLen) {nP->UnLock(); return Unreachable(Sel, false);}
Sel.Resp.DLen++; Sel.smask = nP->NodeMask;

@@ -1683,7 +1682,7 @@ int XrdCmsCluster::SelNode(XrdCmsSelect &Sel, SMask_t pmask, SMask_t amask)
@@ -1689,7 +1688,7 @@ int XrdCmsCluster::SelNode(XrdCmsSelect &Sel, SMask_t pmask, SMask_t amask)
if ((mask = (pmask | amask) & peerHost)) nP = SelbyCost(mask, selR);
if (nP)
{nP->g2nLock(STMutex);
Expand All @@ -305,7 +305,7 @@ index 7649ebdde6e..428a548d7d9 100644
Sel.Resp.DLen++; Sel.smask = nP->NodeMask;
if (Sel.iovN && Sel.iovP) nP->Send(Sel.iovP, Sel.iovN);
diff --git a/src/XrdCms/XrdCmsNode.cc b/src/XrdCms/XrdCmsNode.cc
index b453523b805..dce904b9275 100644
index b453523..dce904b 100644
--- a/src/XrdCms/XrdCmsNode.cc
+++ b/src/XrdCms/XrdCmsNode.cc
@@ -166,6 +166,8 @@ void XrdCmsNode::setName(XrdLink *lnkp, const char *theIF, int port)
Expand All @@ -318,10 +318,10 @@ index b453523b805..dce904b9275 100644
//
myName = strdup(hname);
diff --git a/src/XrdNet/XrdNetIF.cc b/src/XrdNet/XrdNetIF.cc
index 8d004c32198..9b9630c5137 100644
index 5e06b79..bde58b0 100644
--- a/src/XrdNet/XrdNetIF.cc
+++ b/src/XrdNet/XrdNetIF.cc
@@ -404,7 +404,23 @@ int XrdNetIF::GetDest(char *dest, int dlen, ifType ifT, bool prefn)
@@ -403,7 +403,23 @@ int XrdNetIF::GetDest(char *dest, int dlen, ifType ifT, bool prefn)
strcpy(dest +ifP->iLen, portSfx.val);
return n;
}
Expand All @@ -347,7 +347,7 @@ index 8d004c32198..9b9630c5137 100644
/* G e t I F */
/******************************************************************************/
diff --git a/src/XrdNet/XrdNetIF.hh b/src/XrdNet/XrdNetIF.hh
index b369566222e..849b67e1d3d 100644
index b369566..849b67e 100644
--- a/src/XrdNet/XrdNetIF.hh
+++ b/src/XrdNet/XrdNetIF.hh
@@ -32,6 +32,7 @@
Expand All @@ -358,7 +358,7 @@ index b369566222e..849b67e1d3d 100644

//------------------------------------------------------------------------------
//! The XrdNetIF class handles host interfaces. It is used to obtain the
@@ -89,6 +90,18 @@ public:
@@ -89,6 +90,18 @@ class XrdNetIF

int GetDest(char *dest, int dlen, ifType ifT=PublicV6, bool prefn=false);

Expand Down Expand Up @@ -427,6 +427,8 @@ index b369566222e..849b67e1d3d 100644
static
XrdSysError *eDest;
static
--
2.43.5

From 459a5c7227b80f33aa58af5de2c28281124aa337 Mon Sep 17 00:00:00 2001
From: Brian Bockelman <[email protected]>
Expand Down
Loading

0 comments on commit c61d11a

Please sign in to comment.