Skip to content

Commit

Permalink
Merge branch 'candidate-8.6.x'
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Chapman <[email protected]>
  • Loading branch information
richardkchapman committed May 11, 2022
2 parents b7c656d + f0a7a46 commit 98503e5
Show file tree
Hide file tree
Showing 112 changed files with 5,264 additions and 987 deletions.
5 changes: 1 addition & 4 deletions dali/base/dadiags.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,7 @@ class CDaliDiagnosticsServer: public IDaliServer, public Thread
StringAttr id;
StringBuffer buf;
params.read(id);
if (0 == stricmp(id,"threads")) {
mb.append(getThreadList(buf).str());
}
else if (0 == stricmp(id, "mpqueue")) {
if (0 == stricmp(id, "mpqueue")) {
mb.append(getReceiveQueueDetails(buf).str());
}
else if (0 == stricmp(id, "locks")) { // Legacy - newer diag clients should use querySDS().getLocks() directly
Expand Down
15 changes: 14 additions & 1 deletion dali/base/dafdesc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,10 @@ void ClusterPartDiskMapSpec::setRoxie (unsigned redundancy, unsigned channelsPer
{
flags = 0;
replicateOffset = _replicateOffset?_replicateOffset:1;
defaultCopies = redundancy+1;
#ifdef _CONTAINERIZED
// NB: in containerized mode the cluster spec. redundancy isn't used.
redundancy = 0;
#endif
if ((channelsPerNode>1)&&(redundancy==0)) {
flags |= CPDMSF_wrapToNextDrv;
flags |= CPDMSF_overloadedConfig;
Expand Down Expand Up @@ -223,6 +226,11 @@ void ClusterPartDiskMapSpec::fromProp(IPropertyTree *tree)
}
replicateOffset = getPropDef(tree,"@replicateOffset",1);
defaultCopies = getPropDef(tree,"@redundancy",defrep)+1;
#ifdef _CONTAINERIZED
// NB: in containerized mode the cluster spec. redundancy isn't used.
// Force number of copies to 1 here (on deserialization) to avoid code paths that would look at redundant copies.
defaultCopies = 1;
#endif
maxDrvs = (byte)getPropDef(tree,"@maxDrvs",2);
startDrv = (byte)getPropDef(tree,"@startDrv",defrep?0:getPathDrive(dir.str()));
interleave = getPropDef(tree,"@interleave",0);
Expand Down Expand Up @@ -256,6 +264,11 @@ void ClusterPartDiskMapSpec::deserialize(MemoryBuffer &mb)
mb.read(flags);
mb.read(replicateOffset);
mb.read(defaultCopies);
#ifdef _CONTAINERIZED
// NB: in containerized mode the cluster spec. redundancy isn't used.
// Force number of copies to 1 here (on deserialization) to avoid code paths that would look at redundant copies.
defaultCopies = 1;
#endif
mb.read(startDrv);
mb.read(maxDrvs);
mb.read(interleave);
Expand Down
5 changes: 5 additions & 0 deletions dali/base/dafdesc.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ enum DFD_OS
enum DFD_Replicate
{
DFD_NoCopies = 1,
#ifdef _CONTAINERIZED
// NB: in containerized mode, each plane has only 1 copy.
DFD_DefaultCopies = 1
#else
DFD_DefaultCopies = 2
#endif
};

enum GroupType { grp_thor, grp_thorspares, grp_roxie, grp_hthor, grp_unknown, __grp_size };
Expand Down
2 changes: 2 additions & 0 deletions dockerfiles/platform-core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ RUN apt-get clean -y && \
RUN apt-get install -y \
default-jdk \
g++ \
git \
git-lfs \
openssh-client \
libapr1 \
libnuma1 \
Expand Down
Loading

0 comments on commit 98503e5

Please sign in to comment.