dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5624 from thingsboard/lwm2m_fix_bug_ota_start_info

Browse Source 
[3.3.3] lwm2m - info about previous update Ota
This commit is contained in:
Yevhen Bondarenko 2021-11-29 12:12:07 +02:00 committed by GitHub
commit 774f175f7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/DefaultLwM2MOtaUpdateService.java
View File

@ -74,6 +74,8 @@ import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDA
import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATING; import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATING;
import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.VERIFIED; import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.VERIFIED;
import static org.thingsboard.server.common.data.ota.OtaPackageUtil.getAttributeKey; import static org.thingsboard.server.common.data.ota.OtaPackageUtil.getAttributeKey;
import static org.thingsboard.server.transport.lwm2m.server.ota.firmware.FirmwareUpdateResult.UPDATE_SUCCESSFULLY;
import static org.thingsboard.server.transport.lwm2m.server.ota.software.SoftwareUpdateResult.NOT_ENOUGH_STORAGE;
import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.LOG_LWM2M_TELEMETRY; import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.LOG_LWM2M_TELEMETRY;
import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.convertObjectIdToVersionedId; import static org.thingsboard.server.transport.lwm2m.utils.LwM2MTransportUtil.convertObjectIdToVersionedId;
@ -399,12 +401,12 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
log.debug("[{}] Starting update to [{}{}] using binary", client.getEndpoint(), fwInfo.getTargetName(), fwInfo.getTargetVersion()); log.debug("[{}] Starting update to [{}{}] using binary", client.getEndpoint(), fwInfo.getTargetName(), fwInfo.getTargetVersion());
startUpdateUsingBinary(client, fwInfo); startUpdateUsingBinary(client, fwInfo);
} }
} else if (fwInfo.updateState != null) { } else if (fwInfo.getResult() != null && fwInfo.getResult().getCode() > UPDATE_SUCCESSFULLY.getCode()) {
log.debug("[{}] failed to process firmware update: [{}]. Previous update failed.", client.getEndpoint(), fwInfo); log.trace("[{}] Previous update failed. [{}]", client.getEndpoint(), fwInfo);
logService.log(client, "Failed to process firmware update: " + fwInfo + ". Previous update failed."); logService.log(client, "Previous update firmware failed. Result: " + fwInfo.getResult().name());
} }
} catch (Exception e) { } catch (Exception e) {
log.info("[{}] failed to update client: {}", client.getEndpoint(), fwInfo, e); log.error("[{}] failed to update client: {}", client.getEndpoint(), fwInfo, e);
sendStateUpdateToTelemetry(client, fwInfo, OtaPackageUpdateStatus.FAILED, "Internal server error: " + e.getMessage()); sendStateUpdateToTelemetry(client, fwInfo, OtaPackageUpdateStatus.FAILED, "Internal server error: " + e.getMessage());
} }
} }
@ -427,9 +429,9 @@ public class DefaultLwM2MOtaUpdateService extends LwM2MExecutorAwareService impl
startUpdateUsingBinary(client, swInfo); startUpdateUsingBinary(client, swInfo);
} }
} }
} else if (swInfo.updateState != null) { } else if (swInfo.getResult() != null && swInfo.getResult().getCode() >= NOT_ENOUGH_STORAGE.getCode()) {
log.debug("[{}] failed to update client: [{}], previous update failed.", client.getEndpoint(), swInfo); log.trace("[{}] Previous update failed. [{}]", client.getEndpoint(), swInfo);
logService.log(client, "Failed to process software update: " + swInfo + ". Previous update failed."); logService.log(client, "Previous update software failed. Result: " + swInfo.getResult().name());
} }
} catch (Exception e) { } catch (Exception e) {
log.info("[{}] failed to update client: {}", client.getEndpoint(), swInfo, e); log.info("[{}] failed to update client: {}", client.getEndpoint(), swInfo, e);

8
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/firmware/FirmwareUpdateState.java
View File

@ -15,6 +15,8 @@
*/ */
package org.thingsboard.server.transport.lwm2m.server.ota.firmware; package org.thingsboard.server.transport.lwm2m.server.ota.firmware;
import lombok.Getter;
/** /**
* /** State R * /** State R
* 0: Idle (before downloading or after successful updating) * 0: Idle (before downloading or after successful updating)
@ -28,8 +30,10 @@ public enum FirmwareUpdateState {
DOWNLOADED(2, "Downloaded"), DOWNLOADED(2, "Downloaded"),
UPDATING(3, "Updating"); UPDATING(3, "Updating");
public int code; @Getter
public String type; private int code;
@Getter
private String type;
FirmwareUpdateState(int code, String type) { FirmwareUpdateState(int code, String type) {
this.code = code; this.code = code;

8
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/software/SoftwareUpdateResult.java
View File

@ -56,10 +56,12 @@ public enum SoftwareUpdateResult {
INSTALL_FAILURE(58, "Software installation failure", true), INSTALL_FAILURE(58, "Software installation failure", true),
UN_INSTALL_FAILURE(59, "Uninstallation Failure during forUpdate(arg=0)", true); UN_INSTALL_FAILURE(59, "Uninstallation Failure during forUpdate(arg=0)", true);
public int code;
public String type;
@Getter @Getter
public boolean isAgain; private int code;
@Getter
private String type;
@Getter
private boolean isAgain;
SoftwareUpdateResult(int code, String type, boolean isAgain) { SoftwareUpdateResult(int code, String type, boolean isAgain) {
this.code = code; this.code = code;

8
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/ota/software/SoftwareUpdateState.java
View File

@ -15,6 +15,8 @@
*/ */
package org.thingsboard.server.transport.lwm2m.server.ota.software; package org.thingsboard.server.transport.lwm2m.server.ota.software;
import lombok.Getter;
/** /**
* SW Update State R * SW Update State R
* 0: INITIAL Before downloading. (see 5.1.2.1) * 0: INITIAL Before downloading. (see 5.1.2.1)
@ -33,8 +35,10 @@ public enum SoftwareUpdateState {
DELIVERED(3, "Delivered"), DELIVERED(3, "Delivered"),
INSTALLED(4, "Installed"); INSTALLED(4, "Installed");
public int code; @Getter
public String type; private int code;
@Getter
private String type;
SoftwareUpdateState(int code, String type) { SoftwareUpdateState(int code, String type) {
this.code = code; this.code = code;

6
common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/utils/LwM2MTransportUtil.java
View File

@ -150,7 +150,7 @@ public class LwM2MTransportUtil {
if (path != null) { if (path != null) {
if (FW_STATE_ID.equals(path)) { if (FW_STATE_ID.equals(path)) {
lwM2mOtaConvert.setCurrentType(STRING); lwM2mOtaConvert.setCurrentType(STRING);
lwM2mOtaConvert.setValue(FirmwareUpdateState.fromStateFwByCode(((Long) value).intValue()).type); lwM2mOtaConvert.setValue(FirmwareUpdateState.fromStateFwByCode(((Long) value).intValue()).getType());
return lwM2mOtaConvert; return lwM2mOtaConvert;
} else if (FW_RESULT_ID.equals(path)) { } else if (FW_RESULT_ID.equals(path)) {
lwM2mOtaConvert.setCurrentType(STRING); lwM2mOtaConvert.setCurrentType(STRING);
@ -158,11 +158,11 @@ public class LwM2MTransportUtil {
return lwM2mOtaConvert; return lwM2mOtaConvert;
} else if (SW_STATE_ID.equals(path)) { } else if (SW_STATE_ID.equals(path)) {
lwM2mOtaConvert.setCurrentType(STRING); lwM2mOtaConvert.setCurrentType(STRING);
lwM2mOtaConvert.setValue(SoftwareUpdateState.fromUpdateStateSwByCode(((Long) value).intValue()).type); lwM2mOtaConvert.setValue(SoftwareUpdateState.fromUpdateStateSwByCode(((Long) value).intValue()).getType());
return lwM2mOtaConvert; return lwM2mOtaConvert;
} else if (SW_RESULT_ID.equals(path)) { } else if (SW_RESULT_ID.equals(path)) {
lwM2mOtaConvert.setCurrentType(STRING); lwM2mOtaConvert.setCurrentType(STRING);
lwM2mOtaConvert.setValue(SoftwareUpdateResult.fromUpdateResultSwByCode(((Long) value).intValue()).type); lwM2mOtaConvert.setValue(SoftwareUpdateResult.fromUpdateResultSwByCode(((Long) value).intValue()).getType());
return lwM2mOtaConvert; return lwM2mOtaConvert;
} }
} }