Require Galaxy query readiness on automatic startup
This commit is contained in:
@@ -182,7 +182,7 @@ impl Primary {
|
|||||||
.source
|
.source
|
||||||
.as_mut()
|
.as_mut()
|
||||||
.expect("started helper")
|
.expect("started helper")
|
||||||
.request(!emit && self.require_live_query)
|
.request(self.require_live_query)
|
||||||
.is_err()
|
.is_err()
|
||||||
{
|
{
|
||||||
self.reset();
|
self.reset();
|
||||||
@@ -328,7 +328,10 @@ impl AlarmRuntime {
|
|||||||
}
|
}
|
||||||
match subscription.mode {
|
match subscription.mode {
|
||||||
Mode::Alarmmgr => match outcome {
|
Mode::Alarmmgr => match outcome {
|
||||||
Ok(()) => subscription.failures = 0,
|
Ok(()) => {
|
||||||
|
primary.require_live_query = false;
|
||||||
|
subscription.failures = 0;
|
||||||
|
}
|
||||||
Err(hr) if subscription.automatic => {
|
Err(hr) if subscription.automatic => {
|
||||||
subscription.failures += 1;
|
subscription.failures += 1;
|
||||||
if subscription.failures >= subscription.settings.consecutive_failure_threshold
|
if subscription.failures >= subscription.settings.consecutive_failure_threshold
|
||||||
@@ -399,6 +402,10 @@ impl AlarmRuntime {
|
|||||||
"Alarm failover settings must be positive",
|
"Alarm failover settings must be positive",
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
let local_manager = automatic
|
||||||
|
.then(|| LocalAlarmmgr::for_subscription(&request.subscription_expression))
|
||||||
|
.flatten();
|
||||||
|
let require_live_query = local_manager.is_some();
|
||||||
let mut subscription = Subscription {
|
let mut subscription = Subscription {
|
||||||
mode: if mode == Mode::Subtag {
|
mode: if mode == Mode::Subtag {
|
||||||
Mode::Subtag
|
Mode::Subtag
|
||||||
@@ -406,13 +413,11 @@ impl AlarmRuntime {
|
|||||||
Mode::Alarmmgr
|
Mode::Alarmmgr
|
||||||
},
|
},
|
||||||
primary: (mode != Mode::Subtag).then(|| Primary {
|
primary: (mode != Mode::Subtag).then(|| Primary {
|
||||||
local_manager: automatic
|
local_manager,
|
||||||
.then(|| LocalAlarmmgr::for_subscription(&request.subscription_expression))
|
|
||||||
.flatten(),
|
|
||||||
expression: request.subscription_expression,
|
expression: request.subscription_expression,
|
||||||
source: None,
|
source: None,
|
||||||
pending_until: None,
|
pending_until: None,
|
||||||
require_live_query: false,
|
require_live_query,
|
||||||
records: BTreeMap::new(),
|
records: BTreeMap::new(),
|
||||||
truncated: false,
|
truncated: false,
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ use crate::mxaccess::{pump_messages, Apartment};
|
|||||||
pub const ARGUMENT: &str = "--wnwrap-snapshot-worker";
|
pub const ARGUMENT: &str = "--wnwrap-snapshot-worker";
|
||||||
const MAX_SNAPSHOT_BYTES: usize = 128 * 1024 * 1024;
|
const MAX_SNAPSHOT_BYTES: usize = 128 * 1024 * 1024;
|
||||||
const SNAPSHOT: u8 = 1;
|
const SNAPSHOT: u8 = 1;
|
||||||
const RECOVERY_PROBE: u8 = 2;
|
const CHECK_QUERY: u8 = 2;
|
||||||
const QUERY_PENDING: i32 = 1;
|
const QUERY_PENDING: i32 = 1;
|
||||||
|
|
||||||
type SnapshotReply = Result<Option<String>, HRESULT>;
|
type SnapshotReply = Result<Option<String>, HRESULT>;
|
||||||
@@ -104,10 +104,10 @@ impl SnapshotProcess {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn request(&mut self, recovering: bool) -> io::Result<()> {
|
pub fn request(&mut self, check_query: bool) -> io::Result<()> {
|
||||||
// The parent allows only one outstanding byte on the request pipe.
|
// The parent allows only one outstanding byte on the request pipe.
|
||||||
self.requests
|
self.requests
|
||||||
.write_all(&[if recovering { RECOVERY_PROBE } else { SNAPSHOT }])
|
.write_all(&[if check_query { CHECK_QUERY } else { SNAPSHOT }])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -154,7 +154,7 @@ pub fn run() -> ExitCode {
|
|||||||
let mut subscription = None;
|
let mut subscription = None;
|
||||||
let mut request = [0];
|
let mut request = [0];
|
||||||
while input.read_exact(&mut request).is_ok()
|
while input.read_exact(&mut request).is_ok()
|
||||||
&& matches!(request[0], SNAPSHOT | RECOVERY_PROBE)
|
&& matches!(request[0], SNAPSHOT | CHECK_QUERY)
|
||||||
&& pump_messages()
|
&& pump_messages()
|
||||||
{
|
{
|
||||||
let reply = (|| {
|
let reply = (|| {
|
||||||
@@ -163,7 +163,7 @@ pub fn run() -> ExitCode {
|
|||||||
}
|
}
|
||||||
let consumer = subscription.as_ref().expect("subscribed");
|
let consumer = subscription.as_ref().expect("subscribed");
|
||||||
let xml = consumer.snapshot(limit)?;
|
let xml = consumer.snapshot(limit)?;
|
||||||
if request[0] == RECOVERY_PROBE && !consumer.query_complete()? {
|
if request[0] == CHECK_QUERY && !consumer.query_complete()? {
|
||||||
return Ok(None);
|
return Ok(None);
|
||||||
}
|
}
|
||||||
Ok(Some(xml))
|
Ok(Some(xml))
|
||||||
|
|||||||
Reference in New Issue
Block a user