From b109001f3c16c45c87908db6508680e11594a71b Mon Sep 17 00:00:00 2001 From: SajinaKandy Date: Wed, 8 Feb 2023 08:13:50 -0800 Subject: [PATCH] Print Version Incompatible message at client and server if JITServerLogConnection specified Closes: ##16679 Signed-off-by: Sajina Kandy --- runtime/compiler/control/CompilationThread.cpp | 2 +- runtime/compiler/control/JITServerCompilationThread.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runtime/compiler/control/CompilationThread.cpp b/runtime/compiler/control/CompilationThread.cpp index c2f5d5d9dda..6eb102aca72 100644 --- a/runtime/compiler/control/CompilationThread.cpp +++ b/runtime/compiler/control/CompilationThread.cpp @@ -11266,7 +11266,7 @@ TR::CompilationInfoPerThreadBase::processException( } catch (const JITServer::StreamVersionIncompatible &e) { - if (TR::Options::getVerboseOption(TR_VerboseJITServer)) + if (TR::Options::getVerboseOption(TR_VerboseJITServer) || TR::Options::getVerboseOption(TR_VerboseJITServerConns)) TR_VerboseLog::writeLineLocked(TR_Vlog_JITServer, "compThreadID=%d JITServer StreamVersionIncompatible: %s", getCompThreadId(), e.what()); Trc_JITServerStreamVersionIncompatible(vmThread, getCompThreadId(), __FUNCTION__, compiler->signature(), compiler->getHotnessName(), e.what()); _methodBeingCompiled->_compErrCode = compilationStreamVersionIncompatible; diff --git a/runtime/compiler/control/JITServerCompilationThread.cpp b/runtime/compiler/control/JITServerCompilationThread.cpp index de233c9fa47..44572cb85b2 100644 --- a/runtime/compiler/control/JITServerCompilationThread.cpp +++ b/runtime/compiler/control/JITServerCompilationThread.cpp @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2022 IBM Corp. and others + * Copyright (c) 2018, 2023 IBM Corp. and others * * This program and the accompanying materials are made available under * the terms of the Eclipse Public License 2.0 which accompanies this @@ -948,7 +948,7 @@ TR::CompilationInfoPerThreadRemote::processEntry(TR_MethodToBeCompiled &entry, J } catch (const JITServer::StreamVersionIncompatible &e) { - if (TR::Options::getVerboseOption(TR_VerboseJITServer)) + if (TR::Options::getVerboseOption(TR_VerboseJITServer) || TR::Options::getVerboseOption(TR_VerboseJITServerConns)) TR_VerboseLog::writeLineLocked(TR_Vlog_JITServer, "compThreadID=%d stream version incompatible: %s", getCompThreadId(), e.what()); Trc_JITServerStreamVersionIncompatible(compThread, getCompThreadId(), __FUNCTION__, "", "", e.what());