Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit e555d42

Browse files
committed
Issue 736: fix bbcmds CSM timeout handling
1 parent cd9e872 commit e555d42

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

bb/scripts/stagein_admin.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ ()
6868

6969
print "Creating mount point $BBPATH\n";
7070
$result = bbcmd("$TARGET_ALL mkdir --path=$BBPATH");
71-
push(@cleanup, "$TARGET_ALL rmdir --path=$BBPATH") if(bbgetsuccess($resullt) > 0);
71+
push(@cleanup, "$TARGET_ALL rmdir --path=$BBPATH") if(bbgetsuccess($result) > 0);
7272
failureCleanAndExit("mkdir failed") if(bbgetrc($result) != 0);
7373

7474
print "Changing mount point $BBPATH ownership to $JOBUSER\n";
@@ -81,7 +81,7 @@ ()
8181

8282
print "Creating logical volume $BBPATH with size $BB_SSD_MIN\n";
8383
$result = bbcmd("$TARGET_ALL create --mount=$BBPATH --size=$BB_SSD_MIN");
84-
push(@cleanup, "$TARGET_ALL remove --mount=$BBPATH") if(bbgetsuccess($resullt) > 0);
84+
push(@cleanup, "$TARGET_ALL remove --mount=$BBPATH") if(bbgetsuccess($result) > 0);
8585
failureCleanAndExit("create LV failed") if(bbgetrc($result) != 0);
8686
}
8787

bb/src/nodecontroller_csm.cc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,10 +616,14 @@ int NodeController_CSM::bbcmd(std::vector<std::uint32_t> ranklist,
616616
{
617617
output.boost::property_tree::ptree::put_child(results[0].front().first, results[0].front().second); // pick first (good) result
618618
}
619-
else
619+
else if(cuml_badresult.size() > 0)
620620
{
621621
output.boost::property_tree::ptree::put_child(cuml_rank, cuml_badresult.front().second); // pick first bad result
622622
}
623+
else
624+
{
625+
LOG(bb,info) << "bbcmd failure not specific to a node. rc=" << cuml_rankrc;
626+
}
623627
}
624628
}
625629
catch(exception& e)

0 commit comments

Comments
 (0)