Paths

Table of Contentst

-
services/tunnelbroker/src/
-
tunnelbroker/
-
src/
1/2
amqp.rs

[tunnelbroker] Implement AMQP reconnect on channel access
ClosedPublic
Actions

Authored by bartek on Oct 3 2024, 1:36 PM.

Details

Reviewers

kamil
varun
will

Commits

rCOMM36e96f2b24e9: [tunnelbroker] Implement AMQP reconnect on channel access

Summary

When retrieving a channel, check connection status and reconnect if needed.
It should be performed once. If multiple tasks want to retrieve a channel, they wait for reconnection result. This is ensured by the RwLock

Depends on D13601

Test Plan

Tested together with the rest of the stack on staging and commtest (example test plan in D13595)

Diff Detail

Repository

rCOMM Comm

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

bartek created this revision.Oct 3 2024, 1:36 PM

bartek held this revision as a draft.

Herald added subscribers: tomek, ashoat. · View Herald TranscriptOct 3 2024, 1:36 PM

bartek added a child revision: D13604: [tunnelbroker] Use AMQP wrapper in servers.Oct 3 2024, 1:36 PM

Harbormaster failed remote builds in B32054: Diff 44883!Oct 3 2024, 1:43 PM

Rebase

Harbormaster completed remote builds in B32062: Diff 44893.Oct 4 2024, 3:43 AM

bartek published this revision for review.Oct 4 2024, 3:49 AM

bartek edited the summary of this revision. (Show Details)

bartek edited the test plan for this revision. (Show Details)

Remove connection pool

bartek edited the summary of this revision. (Show Details)Oct 4 2024, 8:19 AM

bartek added a parent revision: D13601: [tunnelbroker] Create thread-safe wrapper over AMQP connection.

bartek removed a parent revision: D13602: [tunnelbroker] Implement AMQP Channel hash-modulo-N pool.

Harbormaster completed remote builds in B32068: Diff 44900.Oct 4 2024, 8:35 AM

Nice work with locks

This revision is now accepted and ready to land.Oct 7 2024, 1:47 AM

Closed by commit rCOMM36e96f2b24e9: [tunnelbroker] Implement AMQP reconnect on channel access (authored by bartek). · Explain WhyOct 7 2024, 7:28 AM

This revision was automatically updated to reflect the committed changes.

bartek added a commit: rCOMM36e96f2b24e9: [tunnelbroker] Implement AMQP reconnect on channel access.

Revision Contents
Changeset List

Path

Size

services/

tunnelbroker/

src/

amqp.rs

21 lines

Diff 44900

View Options

services/tunnelbroker/src/amqp.rs

Show First 20 Lines • Show All 155 Lines • ▼ Show 20 Lines
};		};
type Props = {		type Props = {
...BaseProps,		...BaseProps,
// Redux state		// Redux state
+dimensions: DerivedDimensionsInfo,		+dimensions: DerivedDimensionsInfo,
// withOverlayContext		// withOverlayContext
+overlayContext: ?OverlayContextType,		+overlayContext: ?OverlayContextType,
+isActive: boolean,		+isActive: boolean,
};
type State = {
+closeButtonEnabled: boolean,		+closeButtonEnabled: boolean,
+actionLinksEnabled: boolean,		+actionLinksEnabled: boolean,
};		+updateCloseButtonEnabled: ([number]) => void,
class FullScreenViewModal extends React.PureComponent<Props, State> {		+updateActionLinksEnabled: ([number]) => void,
state: State = {
closeButtonEnabled: true,
actionLinksEnabled: true,
};		};

		class FullScreenViewModal extends React.PureComponent<Props> {
closeButton: ?React.ElementRef<TouchableOpacityInstance>;		closeButton: ?React.ElementRef<TouchableOpacityInstance>;
mediaIconsContainer: ?React.ElementRef<typeof View>;		mediaIconsContainer: ?React.ElementRef<typeof View>;
closeButtonX: Value = new Value(-1);		closeButtonX: Value = new Value(-1);
closeButtonY: Value = new Value(-1);		closeButtonY: Value = new Value(-1);
closeButtonWidth: Value = new Value(0);		closeButtonWidth: Value = new Value(0);
closeButtonHeight: Value = new Value(0);		closeButtonHeight: Value = new Value(0);
closeButtonLastState: Value = new Value(1);		closeButtonLastState: Value = new Value(1);
mediaIconsX: Value = new Value(-1);		mediaIconsX: Value = new Value(-1);
▲ Show 20 Lines • Show All 472 Lines • ▼ Show 20 Lines	return block([
],		],
),		),
),		),
set(this.actionLinksLastState, actionLinksState),		set(this.actionLinksLastState, actionLinksState),
set(this.closeButtonLastState, closeButtonState),		set(this.closeButtonLastState, closeButtonState),
set(wasZoomed, isZoomed),		set(wasZoomed, isZoomed),
set(lastTapX, singleTapX),		set(lastTapX, singleTapX),
set(lastTapY, singleTapY),		set(lastTapY, singleTapY),
call([eq(curCloseButtonOpacity, 1)], this.setCloseButtonEnabled),		call([eq(curCloseButtonOpacity, 1)], this.props.updateCloseButtonEnabled),
call([eq(curActionLinksOpacity, 1)], this.setActionLinksEnabled),		call([eq(curActionLinksOpacity, 1)], this.props.updateActionLinksEnabled),
]);		]);
}		}

doubleTapUpdate(		doubleTapUpdate(
// Inputs		// Inputs
doubleTapState: Node,		doubleTapState: Node,
doubleTapX: Node,		doubleTapX: Node,
doubleTapY: Node,		doubleTapY: Node,
▲ Show 20 Lines • Show All 316 Lines • ▼ Show 20 Lines	const mediaIconsButtonStyle = {
opacity: this.actionLinksOpacity,		opacity: this.actionLinksOpacity,
};		};

let saveButton;		let saveButton;
if (saveContentCallback) {		if (saveContentCallback) {
saveButton = (		saveButton = (
<TouchableOpacity		<TouchableOpacity
onPress={saveContentCallback}		onPress={saveContentCallback}
disabled={!this.state.actionLinksEnabled}		disabled={!this.props.actionLinksEnabled}
style={styles.mediaIconButtons}		style={styles.mediaIconButtons}
>		>
<SWMansionIcon name="save" style={styles.mediaIcon} />		<SWMansionIcon name="save" style={styles.mediaIcon} />
<Text style={styles.mediaIconText}>Save</Text>		<Text style={styles.mediaIconText}>Save</Text>
</TouchableOpacity>		</TouchableOpacity>
);		);
}		}

let copyButton;		let copyButton;
if (Platform.OS === 'ios' && copyContentCallback) {		if (Platform.OS === 'ios' && copyContentCallback) {
copyButton = (		copyButton = (
<TouchableOpacity		<TouchableOpacity
onPress={copyContentCallback}		onPress={copyContentCallback}
disabled={!this.state.actionLinksEnabled}		disabled={!this.props.actionLinksEnabled}
style={styles.mediaIconButtons}		style={styles.mediaIconButtons}
>		>
<SWMansionIcon name="copy" style={styles.mediaIcon} />		<SWMansionIcon name="copy" style={styles.mediaIcon} />
<Text style={styles.mediaIconText}>Copy</Text>		<Text style={styles.mediaIconText}>Copy</Text>
</TouchableOpacity>		</TouchableOpacity>
);		);
}		}

Show All 26 Lines	const view = (
</View>		</View>
<SafeAreaView style={styles.buttonsOverlay}>		<SafeAreaView style={styles.buttonsOverlay}>
<View style={styles.fill}>		<View style={styles.fill}>
<Animated.View		<Animated.View
style={[styles.closeButtonContainer, closeButtonStyle]}		style={[styles.closeButtonContainer, closeButtonStyle]}
>		>
<TouchableOpacity		<TouchableOpacity
onPress={this.close}		onPress={this.close}
disabled={!this.state.closeButtonEnabled}		disabled={!this.props.closeButtonEnabled}
onLayout={this.onCloseButtonLayout}		onLayout={this.onCloseButtonLayout}
ref={this.closeButtonRef}		ref={this.closeButtonRef}
>		>
<Text style={styles.closeButton}>×</Text>		<Text style={styles.closeButton}>×</Text>
</TouchableOpacity>		</TouchableOpacity>
</Animated.View>		</Animated.View>
{mediaActionButtons}		{mediaActionButtons}
</View>		</View>
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines	return (
</PinchGestureHandler>		</PinchGestureHandler>
);		);
}		}

close = () => {		close = () => {
this.props.navigation.goBackOnce();		this.props.navigation.goBackOnce();
};		};

setCloseButtonEnabled = ([enabledNum]: [number]) => {
const enabled = !!enabledNum;
if (this.state.closeButtonEnabled !== enabled) {
this.setState({ closeButtonEnabled: enabled });
}
};

setActionLinksEnabled = ([enabledNum]: [number]) => {
const enabled = !!enabledNum;
if (this.state.actionLinksEnabled !== enabled) {
this.setState({ actionLinksEnabled: enabled });
}
};

closeButtonRef = (		closeButtonRef = (
closeButton: ?React.ElementRef<typeof TouchableOpacity>,		closeButton: ?React.ElementRef<typeof TouchableOpacity>,
) => {		) => {
this.closeButton = (closeButton: any);		this.closeButton = (closeButton: any);
};		};

mediaIconsRef = (mediaIconsContainer: ?React.ElementRef<typeof View>) => {		mediaIconsRef = (mediaIconsContainer: ?React.ElementRef<typeof View>) => {
this.mediaIconsContainer = mediaIconsContainer;		this.mediaIconsContainer = mediaIconsContainer;
▲ Show 20 Lines • Show All 116 Lines • ▼ Show 20 Lines	) {
}, [isActive]);		}, [isActive]);

React.useEffect(() => {		React.useEffect(() => {
return () => {		return () => {
Orientation.lockToPortrait();		Orientation.lockToPortrait();
};		};
}, []);		}, []);

		const [closeButtonEnabled, setCloseButtonEnabled] = React.useState(true);
		const [actionLinksEnabled, setActionLinksEnabled] = React.useState(true);

		const updateCloseButtonEnabled = React.useCallback(
		([enabledNum]: [number]) => {
		tomekUnsubmitted Not Done Inline Actions We should prefer `Array` type tomek: We should prefer `Array` type
		angelikaAuthorUnsubmitted Done Inline Actions This was just copied from the original code and the `[number]` argument will be replaced with `number` argument in https://phab.comm.dev/D14304 anyway angelika: This was just copied from the original code and the `[number]` argument will be replaced with…
		const enabled = !!enabledNum;
		if (closeButtonEnabled !== enabled) {
		setCloseButtonEnabled(enabled);
		}
		},
		[closeButtonEnabled],
		);

		const updateActionLinksEnabled = React.useCallback(
		([enabledNum]: [number]) => {
		const enabled = !!enabledNum;
		if (actionLinksEnabled !== enabled) {
		setActionLinksEnabled(enabled);
		}
		},
		[actionLinksEnabled],
		);

return (		return (
<FullScreenViewModal		<FullScreenViewModal
{...props}		{...props}
dimensions={dimensions}		dimensions={dimensions}
overlayContext={overlayContext}		overlayContext={overlayContext}
isActive={isActive}		isActive={isActive}
		closeButtonEnabled={closeButtonEnabled}
		actionLinksEnabled={actionLinksEnabled}
		updateCloseButtonEnabled={updateCloseButtonEnabled}
		updateActionLinksEnabled={updateActionLinksEnabled}
/>		/>
);		);
});		});

export default ConnectedFullScreenViewModal;		export default ConnectedFullScreenViewModal;

[tunnelbroker] Implement AMQP reconnect on channel accessClosedPublicActions