Improve YAML compliance of mgr:jobs report #1794
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -437,17 +437,18 @@ HappyConnOpener::status() const | |
|
|
||
| SBufStream os(buf); | ||
|
|
||
| os << "{ "; | ||
| if (stopReason) | ||
| os << "stopped: \'" << stopReason << '\''; | ||
| if (prime) | ||
| os << ", prime:" << prime; | ||
| if (spare) | ||
| os << ", spare:" << spare; | ||
| if (n_tries) | ||
yadij marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| os << ", tries:" << n_tries; | ||
| os << ", dst:" << *destinations; | ||
| os << ", id: " << id; | ||
| os << " }"; | ||
|
|
||
| buf = os.buf(); | ||
| return buf.c_str(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -357,7 +357,7 @@ Adaptation::Ecap::XactionRep::doneAll() const | |
| void | ||
| Adaptation::Ecap::XactionRep::sinkVb(const char *reason) | ||
| { | ||
| debugs(93,4, "sink for " << reason << "; status: " << status()); | ||
|
|
||
| // we reset raw().body_pipe when we are done, so use this one for checking | ||
| const BodyPipePointer &permPipe = theVirginRep.raw().header->body_pipe; | ||
|
|
@@ -371,7 +371,7 @@ Adaptation::Ecap::XactionRep::sinkVb(const char *reason) | |
| void | ||
| Adaptation::Ecap::XactionRep::preserveVb(const char *reason) | ||
| { | ||
| debugs(93,4, "preserve for " << reason << "; status: " << status()); | ||
|
|
||
| // we reset raw().body_pipe when we are done, so use this one for checking | ||
| const BodyPipePointer &permPipe = theVirginRep.raw().header->body_pipe; | ||
|
|
@@ -387,7 +387,7 @@ Adaptation::Ecap::XactionRep::preserveVb(const char *reason) | |
| void | ||
| Adaptation::Ecap::XactionRep::forgetVb(const char *reason) | ||
| { | ||
| debugs(93,9, "forget vb " << reason << "; status: " << status()); | ||
|
|
||
| BodyPipePointer &p = theVirginRep.raw().body_pipe; | ||
| if (p != nullptr && p->stillConsuming(this)) | ||
|
|
@@ -442,7 +442,7 @@ Adaptation::Ecap::XactionRep::useAdapted(const libecap::shared_ptr<libecap::Mess | |
| updateHistory(msg); | ||
| sendAnswer(Answer::Forward(msg)); | ||
|
|
||
| debugs(93,4, "adapter will produce body " << status()); | ||
| theMaster->abMake(); // libecap will produce | ||
| } | ||
| } | ||
|
|
@@ -702,8 +702,6 @@ Adaptation::Ecap::XactionRep::status() const | |
| static MemBuf buf; | ||
| buf.reset(); | ||
|
|
||
| if (makingVb) | ||
| buf.appendf("M%d", static_cast<int>(makingVb)); | ||
|
|
||
|
|
@@ -732,8 +730,6 @@ Adaptation::Ecap::XactionRep::status() const | |
| buf.append(" A?", 3); | ||
| } | ||
|
|
||
| buf.terminate(); | ||
|
|
||
| return buf.content(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -81,7 +81,7 @@ Adaptation::Icap::ModXact::ModXact(Http::Message *virginHeader, | |||||
| icapReply = new HttpReply; | ||||||
| icapReply->protoPrefix = "ICAP/"; // TODO: make an IcapReply class? | ||||||
|
|
||||||
| debugs(93,7, "initialized. " << status()); | ||||||
| } | ||||||
|
|
||||||
| // initiator wants us to start | ||||||
|
|
@@ -131,7 +131,7 @@ void Adaptation::Icap::ModXact::waitForService() | |||||
| disableRetries(); | ||||||
| disableRepeats("ICAP service is not available"); | ||||||
|
|
||||||
| debugs(93, 7, "will not wait for the service to be available " << | ||||||
| status()); | ||||||
|
|
||||||
| throw TexcHere("ICAP service is not available"); | ||||||
|
|
@@ -196,7 +196,7 @@ void Adaptation::Icap::ModXact::startShoveling() | |||||
| requestBuf.init(); | ||||||
|
|
||||||
| makeRequestHeaders(requestBuf); | ||||||
| debugs(93, 9, "will write " << status() << ":\n" << | ||||||
| (requestBuf.terminate(), requestBuf.content())); | ||||||
|
|
||||||
| // write headers | ||||||
|
|
@@ -237,7 +237,7 @@ void Adaptation::Icap::ModXact::handleCommWroteHeaders() | |||||
|
|
||||||
| void Adaptation::Icap::ModXact::writeMore() | ||||||
| { | ||||||
| debugs(93, 5, "checking whether to write more " << status()); | ||||||
|
|
||||||
| if (writer != nullptr) // already writing something | ||||||
| return; | ||||||
|
|
@@ -274,7 +274,7 @@ void Adaptation::Icap::ModXact::writeMore() | |||||
| void Adaptation::Icap::ModXact::writePreviewBody() | ||||||
| { | ||||||
| debugs(93, 8, "will write Preview body from " << | ||||||
| virgin.body_pipe << ' ' << status()); | ||||||
| Must(state.writing == State::writingPreview); | ||||||
| Must(virgin.body_pipe != nullptr); | ||||||
|
|
||||||
|
|
@@ -298,7 +298,7 @@ void Adaptation::Icap::ModXact::decideWritingAfterPreview(const char *kind) | |||||
| else | ||||||
| stopWriting(true); // ICAP server reply implies no post-preview writing | ||||||
|
|
||||||
| debugs(93, 6, "decided on writing after " << kind << " preview " << | ||||||
| status()); | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -490,12 +490,12 @@ void Adaptation::Icap::ModXact::stopWriting(bool nicely) | |||||
|
|
||||||
| if (writer != nullptr) { | ||||||
| if (nicely) { | ||||||
| debugs(93, 7, "will wait for the last write " << status()); | ||||||
| state.writing = State::writingAlmostDone; // may already be set | ||||||
| checkConsuming(); | ||||||
| return; | ||||||
| } | ||||||
| debugs(93, 3, "will NOT wait for the last write " << status()); | ||||||
|
|
||||||
| // Comm does not have an interface to clear the writer callback nicely, | ||||||
| // but without clearing the writer we cannot recycle the connection. | ||||||
|
|
@@ -506,7 +506,7 @@ void Adaptation::Icap::ModXact::stopWriting(bool nicely) | |||||
| ignoreLastWrite = true; | ||||||
| } | ||||||
|
|
||||||
| debugs(93, 7, "will no longer write " << status()); | ||||||
| if (virginBodyWriting.active()) { | ||||||
| virginBodyWriting.disable(); | ||||||
| virginConsume(); | ||||||
|
|
@@ -520,7 +520,7 @@ void Adaptation::Icap::ModXact::stopBackup() | |||||
| if (!virginBodySending.active()) | ||||||
| return; | ||||||
|
|
||||||
| debugs(93, 7, "will no longer backup " << status()); | ||||||
| virginBodySending.disable(); | ||||||
| virginConsume(); | ||||||
| } | ||||||
|
|
@@ -581,7 +581,7 @@ void Adaptation::Icap::ModXact::echoMore() | |||||
| const size_t sizeMax = virginContentSize(virginBodySending); | ||||||
| debugs(93,5, "will echo up to " << sizeMax << " bytes from " << | ||||||
| virgin.body_pipe->status()); | ||||||
| debugs(93,5, "will echo up to " << sizeMax << " bytes to " << | ||||||
| adapted.body_pipe->status()); | ||||||
|
|
||||||
| if (sizeMax > 0) { | ||||||
|
|
@@ -595,12 +595,12 @@ void Adaptation::Icap::ModXact::echoMore() | |||||
| } | ||||||
|
|
||||||
| if (virginBodyEndReached(virginBodySending)) { | ||||||
| debugs(93, 5, "echoed all " << status()); | ||||||
| stopSending(true); | ||||||
| } else { | ||||||
| debugs(93, 5, "has " << | ||||||
| virgin.body_pipe->buf().contentSize() << " bytes " << | ||||||
| "and expects more to echo " << status()); | ||||||
| // TODO: timeout if virgin or adapted pipes are broken | ||||||
| } | ||||||
| } | ||||||
|
|
@@ -619,7 +619,7 @@ void Adaptation::Icap::ModXact::stopSending(bool nicely) | |||||
| debugs(93, 7, "Proceed with stop sending "); | ||||||
|
|
||||||
| if (state.sending != State::sendingUndecided) { | ||||||
| debugs(93, 7, "will no longer send " << status()); | ||||||
| if (adapted.body_pipe != nullptr) { | ||||||
| virginBodySending.disable(); | ||||||
| // we may leave debts if we were echoing and the virgin | ||||||
|
|
@@ -628,7 +628,7 @@ void Adaptation::Icap::ModXact::stopSending(bool nicely) | |||||
| stopProducingFor(adapted.body_pipe, nicely && !leftDebts); | ||||||
| } | ||||||
| } else { | ||||||
| debugs(93, 7, "will not start sending " << status()); | ||||||
| Must(!adapted.body_pipe); | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -643,13 +643,13 @@ void Adaptation::Icap::ModXact::checkConsuming() | |||||
| if (!virgin.body_pipe || !state.doneConsumingVirgin()) | ||||||
| return; | ||||||
|
|
||||||
| debugs(93, 7, "will stop consuming " << status()); | ||||||
| stopConsumingFrom(virgin.body_pipe); | ||||||
| } | ||||||
|
|
||||||
| void Adaptation::Icap::ModXact::parseMore() | ||||||
| { | ||||||
| debugs(93, 5, "have " << readBuf.length() << " bytes to parse " << status()); | ||||||
| debugs(93, 5, "\n" << readBuf); | ||||||
|
|
||||||
| if (state.parsingHeaders()) | ||||||
|
|
@@ -708,7 +708,7 @@ void Adaptation::Icap::ModXact::bypassFailure() | |||||
| reuseConnection = false; // be conservative | ||||||
| cancelRead(); // may not work; and we cannot stop connecting either | ||||||
| if (!doneWithIo()) | ||||||
| debugs(93, 7, "Warning: bypass failed to stop I/O " << status()); | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
|
|
||||||
| service().noteFailure(); // we are bypassing, but this is still a failure | ||||||
|
|
@@ -1218,7 +1218,7 @@ void Adaptation::Icap::ModXact::stopParsing(const bool checkUnparsedData) | |||||
| if (checkUnparsedData) | ||||||
| Must(readBuf.isEmpty()); | ||||||
|
|
||||||
| debugs(93, 7, "will no longer parse " << status()); | ||||||
|
|
||||||
| delete bodyParser; | ||||||
| bodyParser = nullptr; | ||||||
|
|
@@ -1292,7 +1292,7 @@ Adaptation::Icap::ModXact::~ModXact() | |||||
| // internal cleanup | ||||||
| void Adaptation::Icap::ModXact::swanSong() | ||||||
| { | ||||||
| debugs(93, 5, "swan sings " << status()); | ||||||
|
There was a problem hiding this comment. method name "swanSong" makes the content text redundant.
Suggested change
|
||||||
|
|
||||||
| stopWriting(false); | ||||||
| stopSending(false); | ||||||
|
|
||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,7 +101,7 @@ void Adaptation::Icap::OptXact::handleCommRead(size_t) | |
|
|
||
| bool Adaptation::Icap::OptXact::parseResponse() | ||
| { | ||
| debugs(93, 5, "have " << readBuf.length() << " bytes to parse " << status()); | ||
| debugs(93, DBG_DATA, "\n" << readBuf); | ||
|
|
||
| HttpReply::Pointer r(new HttpReply); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -567,7 +567,7 @@ void Adaptation::Icap::ServiceRep::callException(const std::exception &e) | |
| { | ||
| clearAdaptation(theOptionsFetcher); | ||
| debugs(93,2, "ICAP probably failed to fetch options (" << e.what() << | ||
| ") " << status()); | ||
| handleNewOptions(nullptr); | ||
| } | ||
|
|
||
|
|
@@ -674,12 +674,12 @@ Adaptation::Icap::ServiceRep::makeXactLauncher(Http::Message *virgin, | |
| } | ||
|
|
||
| // returns a temporary string depicting service status, for debugging | ||
| const char * | ||
| Adaptation::Icap::ServiceRep::status() const | ||
| { | ||
| static MemBuf buf; | ||
|
|
||
| buf.reset(); | ||
|
|
||
| if (up()) | ||
| buf.append("up", 2); | ||
|
|
@@ -708,7 +708,6 @@ const char *Adaptation::Icap::ServiceRep::status() const | |
| if (const int failures = theSessionFailures.remembered()) | ||
| buf.appendf(",fail%d", failures); | ||
|
|
||
| buf.terminate(); | ||
|
|
||
| return buf.content(); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please take advantage of the touch to make this produce the log pattern detected by the
scripts/find-alive.pl: