Skip to content

Commit

Permalink
Solving merge conflicts main to develop (Azure#338)
Browse files Browse the repository at this point in the history
* Merge 'develop' into 'main' (Azure#243)

Fix issue in reboot/restart flow and race condition in D2C messaging util (Azure#242)

- Fix an issue for image-based update scenario where the device doesn't reboot after the new image is installed.
- Add ADUC_D2C_Message_Type_Device_Properties to avoid a race condition.


Note | These changes passed e2e verification internally.

* Update issue templates

* Update issue templates

* Update issue templates

Co-authored-by: Nox-MSFT <[email protected]>
Co-authored-by: Esha Shah <[email protected]>
  • Loading branch information
3 people authored Jan 14, 2023
1 parent 023f995 commit 82feadc
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 5 deletions.
52 changes: 52 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
---
name: Bug report
about: Users can use this template to report bugs and provide required information
to enable investigation
title: ''
labels: ''
assignees: ''

---

<!--
Hi there! Thank you for discovering and submitting an issue!
A potentially helpful troubleshooting guide may be found at our [Common issues and resolutions](https://learn.microsoft.com/en-us/azure/iot-hub-device-update/troubleshoot-device-update) page.
Note: please use your Azure subscription if you need to share any information from your Azure subscription such as connection strings, service names (IoTHub, Provisioning), etc.
Need Support?
* Have a feature request? Please post it on [Ideas](https://github.com/Azure/iot-hub-device-update/discussions/categories/ideas) to help us prioritize.
* Have a technical question? Ask on [Q & A](https://github.com/Azure/iot-hub-device-update/discussions/categories/q-a)
* Need support? Azure customers with support plans have access to priority technical support directly from the Azure Portal. Support plan details are at: https://azure.microsoft.com/en-us/support/plans/
Provide a general summary of the issue in the Title above
-->
## Expected Behavior
Tell us what should happen

## Current Behavior
Tell us what happens instead of the expected behavior

## Steps to Reproduce
Provide a detailed set of steps to reproduce the bug.
1.
2.
3.
4.

### Device Information
* Host OS [e.g. Ubuntu 18.04, Windows Server IoT 2019]:
* Architecture [e.g. amd64, arm32, arm64]:
* Provisioning Method:
*DU Agent Version (run 'sudo -u adu /usr/bin/AducIotAgent -v'):

## Logs
<!--
Please share as many logs as possible. This will help debugging
Follow [Create a log collection operation](https://learn.microsoft.com/en-us/azure/iot-hub-device-update/device-update-log-collection?tabs=portal) to help extract useful information.
Don't forget to remove any connection string information!
-->


## Additional Information
Please provide any additional information that may be helpful in understanding the issue.
10 changes: 5 additions & 5 deletions src/utils/d2c_messaging/inc/aduc/d2c_messaging.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ EXTERN_C_BEGIN
typedef enum _tagADUC_D2C_Message_Type
{
ADUC_D2C_Message_Type_Device_Update_Result = 0, /**< deviceUpdate interface reported property */
ADUC_D2C_Message_Type_Device_Update_ACK, /**< deviceUpdate interface ACK */
ADUC_D2C_Message_Type_Device_Information, /**< deviceInformation interface reported property */
ADUC_D2C_Message_Type_Diagnostics, /**< diagnostics interface reported property */
ADUC_D2C_Message_Type_Diagnostics_ACK, /**< diagnostics interface ACK */
ADUC_D2C_Message_Type_Device_Properties, /**< deviceUpdate interface reported property */
ADUC_D2C_Message_Type_Device_Update_ACK, /**< deviceUpdate interface ACK */
ADUC_D2C_Message_Type_Device_Information, /**< deviceInformation interface reported property */
ADUC_D2C_Message_Type_Diagnostics, /**< diagnostics interface reported property */
ADUC_D2C_Message_Type_Diagnostics_ACK, /**< diagnostics interface ACK */
ADUC_D2C_Message_Type_Device_Properties, /**< deviceUpdate interface reported property */
ADUC_D2C_Message_Type_Max
} ADUC_D2C_Message_Type;

Expand Down

0 comments on commit 82feadc

Please sign in to comment.