Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Bug-2080]Fix data too long for column 'heartbeat_msg' #2275

Merged
merged 2 commits into from
Jun 14, 2022
Merged

[Bug-2080]Fix data too long for column 'heartbeat_msg' #2275

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6771b68
fix data too long for column 'heartbeat_msg'
casionone Jun 14, 2022
b5cc614
fix data too long for column 'heartbeat_msg'
casionone Jun 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 14 additions & 5 deletions .../org/apache/linkis/manager/am/service/engine/DefaultEngineConnStatusCallbackService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package org.apache.linkis.manager.am.service.engine

import java.util

import org.apache.commons.lang.StringUtils
import org.apache.linkis.common.utils.Logging
import org.apache.linkis.manager.am.conf.AMConfiguration
Expand All @@ -30,8 +32,6 @@ import org.apache.linkis.server.BDPJettyServerHelper
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.stereotype.Service

import java.util

@Service
class DefaultEngineConnStatusCallbackService extends EngineConnStatusCallbackService with Logging {

Expand All @@ -43,6 +43,9 @@ class DefaultEngineConnStatusCallbackService extends EngineConnStatusCallbackSer

private val canRetryLogs = AMConfiguration.AM_CAN_RETRY_LOGS.getValue.split(";")

//The heartBeatMsg field is of type text, mysql text max byte num is 65535
private val initErrorMsgMaxByteNum = 60000

@Receiver
override def dealEngineConnStatusCallback(engineConnStatusCallbackToAM: EngineConnStatusCallbackToAM): Unit = {

Expand All @@ -52,7 +55,13 @@ class DefaultEngineConnStatusCallbackService extends EngineConnStatusCallbackSer
logger.info(s"Start to deal engineConnStatusCallbackToAM $engineConnStatusCallbackToAM")
val nodeMetrics = new AMNodeMetrics
val heartBeatMsg: java.util.Map[String, Any] = new util.HashMap[String, Any]()
heartBeatMsg.put(AMConstant.START_REASON, engineConnStatusCallbackToAM.initErrorMsg)

var initErrorMsg = engineConnStatusCallbackToAM.initErrorMsg
if (StringUtils.isNotBlank(initErrorMsg) && initErrorMsg.getBytes("utf-8").length >= initErrorMsgMaxByteNum) {
initErrorMsg = initErrorMsg.substring(0, initErrorMsgMaxByteNum)
}
heartBeatMsg.put(AMConstant.START_REASON, initErrorMsg)

if (engineConnStatusCallbackToAM.canRetry) {
heartBeatMsg.put(AMConstant.EC_CAN_RETRY, engineConnStatusCallbackToAM.canRetry)
} else if (matchRetryLog(engineConnStatusCallbackToAM.initErrorMsg)) {
Expand All @@ -76,7 +85,7 @@ class DefaultEngineConnStatusCallbackService extends EngineConnStatusCallbackSer
if (StringUtils.isNotBlank(errorMsg)) {
val errorMsgLowCase = errorMsg.toLowerCase
canRetryLogs.foreach(canRetry =>
if ( errorMsgLowCase.contains(canRetry) ) {
if (errorMsgLowCase.contains(canRetry)) {
logger.error(s"match engineConn log fatal logs,is $canRetry")
flag = true
}
Expand Down