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

[release/1.1] Prevent EdgeHub from starting without a valid configuration #5515

Merged
merged 9 commits into from
Oct 27, 2021
+20 −3
Merged

[release/1.1] Prevent EdgeHub from starting without a valid configuration #5515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1d5a571
Remove nulls from EdgeHub configuration
onalante-msft Sep 12, 2021
d3f4eca
Place desired property updates behind error-prone functions
onalante-msft Sep 13, 2021
1c1119b
Try to handle bad deployment configurations
onalante-msft Sep 14, 2021
8a13bf1
Prevent initialization if no configuration received
onalante-msft Sep 14, 2021
9617dc5
Backport configuration fetch requirement
onalante-msft Sep 16, 2021
2cf375c
Remove trailing whitespace
onalante-msft Sep 16, 2021
b264d77
Revert changes to TwinConfigSource
onalante-msft Sep 16, 2021
6214510
Include error message from later versions
onalante-msft Sep 16, 2021
eb61f7f
Merge remote-tracking branch 'upstream/release/1.1' into hotfix-1.1
onalante-msft Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions edge-hub/src/Microsoft.Azure.Devices.Edge.Hub.Core/config/ConfigUpdater.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ await this.currentConfig.Match(
{
Events.GettingConfig();
await pullTask;

this.currentConfig.Expect<InvalidOperationException>(() => throw new InvalidOperationException(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested text - Cannot start successfully as could not get configuration for EdgeHub.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the same text that is used in later versions. Should we change those also?

"Could not obtain twin neither from local store nor from cloud. " +
"This happens when there is no upstream connection and this is the first EdgeHub startup, " +
"or there is no persistent store to save a previous twin configuration. " +
"EdgeHub cannot start without basic configuration stored in twin. Stopping now."));

return this.currentConfig;
});

Expand Down
16 changes: 13 additions & 3 deletions edge-hub/src/Microsoft.Azure.Devices.Edge.Hub.Service/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@ static async Task<int> MainAsync(IConfigurationRoot configuration)
logger.LogInformation("Initializing configuration");
IConfigSource configSource = await container.Resolve<Task<IConfigSource>>();
ConfigUpdater configUpdater = await container.Resolve<Task<ConfigUpdater>>();
await configUpdater.Init(configSource);

var configDownloadTask = configUpdater.Init(configSource);

if (!Enum.TryParse(configuration.GetValue("AuthenticationMode", string.Empty), true, out AuthenticationMode authenticationMode)
|| authenticationMode != AuthenticationMode.Cloud)
Expand All @@ -107,8 +108,17 @@ static async Task<int> MainAsync(IConfigurationRoot configuration)
using (IProtocolHead protocolHead = await GetEdgeHubProtocolHeadAsync(logger, configuration, container, hosting))
using (var renewal = new CertificateRenewal(certificates, logger))
{
await protocolHead.StartAsync();
await Task.WhenAny(cts.Token.WhenCanceled(), renewal.Token.WhenCanceled());
try
{
await configDownloadTask;
await protocolHead.StartAsync();
await Task.WhenAny(cts.Token.WhenCanceled(), renewal.Token.WhenCanceled());
}
catch (Exception ex)
{
logger.LogError($"Error starting protocol heads: {ex.Message}");
}

logger.LogInformation("Stopping the protocol heads...");
await protocolHead.CloseAsync(CancellationToken.None);
logger.LogInformation("Protocol heads stopped.");
Expand Down