paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-15 11:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

channel: Remove idempotent retry loop.

Browse Source 
This was added by commit 7f174213ed, and
appears to have been designed for responses that are *successful* but
falsy. Logically, these should not implicitly represent a failure to
be retried if it were.

Note from tabbott: The background is that this idempotent retry loop
was a hacky workaround for a bug we never understood but saw daily in
production. Especially during server restarts / client reloads,
something would result in 200 responses with no data being seen by the
frontend, despite the Django server not having received/processed the
request. Fortunately, this strange failure mode appears to have
stopped happening in late 2019, so we can delete this hack.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2022-08-18 19:45:06 -07:00
committed by Tim Abbott
parent 4391bc324b
commit fde9b1d366
25 changed files with 6 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
frontend_tests/node_tests/channel.js
View File

@@ -9,11 +9,6 @@ const {run_test} = require("../zjsunit/test");
const blueslip = require("../zjsunit/zblueslip");
const {page_params} = require("../zjsunit/zpage_params");
set_global("setTimeout", (f, delay) => {
assert.equal(delay, 0);
f();
});
const xhr_401 = {
status: 401,
responseText: '{"msg": "Use cannot access XYZ"}',
@@ -336,30 +331,6 @@ test("unexpected_403_response", () => {
});
});
test("retry", () => {
test_with_mock_ajax({
run_code() {
channel.post({
idempotent: true,
data: 42,
});
},
check_ajax_options(options) {
blueslip.expect("log", "Retrying idempotent[object Object]");
test_with_mock_ajax({
run_code() {
options.simulate_success();
},
check_ajax_options(options) {
assert.equal(options.data, 42);
},
});
},
});
});
test("too_many_pending", () => {
channel.clear_for_tests();
$.ajax = () => {

1
frontend_tests/node_tests/compose.js
View File

@@ -808,7 +808,6 @@ test_ui("on_events", ({override, override_rewire}) => {
override(channel, "post", (payload) => {
assert.equal(payload.url, "/json/messages/render");
assert.ok(payload.idempotent);
assert.ok(payload.data);
assert.deepEqual(payload.data.content, current_message);

1
frontend_tests/node_tests/example7.js
View File

@@ -141,7 +141,6 @@ run_test("unread_ops", ({override}) => {
// url and parameters are specified:
assert.deepEqual(channel_post_opts, {
url: "/json/messages/flags",
idempotent: true,
data: {messages: "[50]", op: "add", flag: "read"},
success: channel_post_opts.success,
});

6
frontend_tests/node_tests/message_flags.js
View File

@@ -169,7 +169,6 @@ run_test("read", ({override}) => {
send_read(msgs_to_flag_read);
assert.deepEqual(channel_post_opts, {
url: "/json/messages/flags",
idempotent: true,
data: {
messages: "[1,2,3,4,5]",
op: "add",
@@ -185,7 +184,6 @@ run_test("read", ({override}) => {
channel_post_opts.success(success_response_data);
assert.deepEqual(channel_post_opts, {
url: "/json/messages/flags",
idempotent: true,
data: {
messages: "[6,7]",
op: "add",
@@ -213,7 +211,6 @@ run_test("read", ({override}) => {
send_read(msgs_to_flag_read);
assert.deepEqual(channel_post_opts, {
url: "/json/messages/flags",
idempotent: true,
data: {
messages: "[3,4,5,6,7]",
op: "add",
@@ -252,7 +249,6 @@ run_test("read", ({override}) => {
// Former locally echoed messages flagging retried
assert.deepEqual(channel_post_opts, {
url: "/json/messages/flags",
idempotent: true,
data: {
messages: "[1,2]",
op: "add",
@@ -304,7 +300,6 @@ run_test("collapse_and_uncollapse", ({override}) => {
assert.deepEqual(channel_post_opts, {
url: "/json/messages/flags",
idempotent: true,
data: {
messages: "[5]",
op: "add",
@@ -316,7 +311,6 @@ run_test("collapse_and_uncollapse", ({override}) => {
assert.deepEqual(channel_post_opts, {
url: "/json/messages/flags",
idempotent: true,
data: {
messages: "[5]",
op: "remove",

1
static/js/activity.js
View File

@@ -197,7 +197,6 @@ export function send_presence_to_server(want_redraw) {
new_user_input,
slim_presence: true,
},
idempotent: true,
success(data) {
// Update Zephyr mirror activity warning
if (data.zephyr_mirror_active === false) {

2
static/js/attachments_ui.js
View File

@@ -53,7 +53,6 @@ function delete_attachments(attachment) {
const $status = $("#delete-upload-status");
channel.del({
url: "/json/attachments/" + attachment,
idempotent: true,
error(xhr) {
ui_report.error($t_html({defaultMessage: "Failed"}), xhr, $status);
},
@@ -152,7 +151,6 @@ export function set_up_attachments() {
channel.get({
url: "/json/attachments",
idempotent: true,
success(data) {
loading.destroy_indicator($("#attachments_loading_indicator"));
format_attachment_data(data.attachments);

21
static/js/channel.js
View File

@@ -39,7 +39,7 @@ function remove_pending_request(jqXHR) {
}
}
function call(args, idempotent) {
function call(args) {
if (reload_state.is_in_progress() && !args.ignore_reload) {
// If we're in the process of reloading, most HTTP requests
// are useless, with exceptions like cleaning up our event
@@ -128,15 +128,6 @@ function call(args, idempotent) {
return;
}
if (!data && idempotent) {
// If idempotent, retry
blueslip.log("Retrying idempotent" + args);
setTimeout(() => {
const jqXHR = $.ajax(args);
add_pending_request(jqXHR);
}, 0);
return;
}
orig_success(data, textStatus, jqXHR);
};
@@ -154,23 +145,23 @@ function call(args, idempotent) {
export function get(options) {
const args = {type: "GET", dataType: "json", ...options};
return call(args, options.idempotent);
return call(args);
}
export function post(options) {
const args = {type: "POST", dataType: "json", ...options};
return call(args, options.idempotent);
return call(args);
}
export function put(options) {
const args = {type: "PUT", dataType: "json", ...options};
return call(args, options.idempotent);
return call(args);
}
// Not called exports.delete because delete is a reserved word in JS
export function del(options) {
const args = {type: "DELETE", dataType: "json", ...options};
return call(args, options.idempotent);
return call(args);
}
export function patch(options) {
@@ -183,7 +174,7 @@ export function patch(options) {
} else {
options.data = {...options.data, method: "PATCH"};
}
return post(options, options.idempotent);
return post(options);
}
export function xhr_error_message(message, xhr) {

1
static/js/compose.js
View File

@@ -381,7 +381,6 @@ export function render_and_show_preview($preview_spinner, $preview_content_box,
}
channel.post({
url: "/json/messages/render",
idempotent: true,
data: {content},
success(response_data) {
if (markdown.contains_backend_only_syntax(content)) {

1
static/js/compose_actions.js
View File

@@ -566,7 +566,6 @@ export function quote_and_reply(opts) {
channel.get({
url: "/json/messages/" + message_id,
idempotent: true,
success(data) {
message.raw_content = data.raw_content;
replace_content(message);

2
static/js/message_edit.js
View File

@@ -705,7 +705,6 @@ export function start($row, edit_box_open_callback) {
const msg_list = message_lists.current;
channel.get({
url: "/json/messages/" + message.id,
idempotent: true,
success(data) {
if (message_lists.current === msg_list) {
message.raw_content = data.raw_content;
@@ -1232,7 +1231,6 @@ export function with_first_message_id(stream_id, topic_name, success_cb, error_c
channel.get({
url: "/json/messages",
data,
idempotent: true,
success(data) {
const message_id = data.messages[0].id;
success_cb(message_id);

1
static/js/message_fetch.js
View File

@@ -261,7 +261,6 @@ export function load_messages(opts) {
channel.get({
url: "/json/messages",
data,
idempotent: true,
success(data) {
get_messages_success(data, opts);
},

3
static/js/message_flags.js
View File

@@ -9,7 +9,6 @@ import * as unread_ops from "./unread_ops";
function send_flag_update_for_messages(msg_ids, flag, op) {
channel.post({
url: "/json/messages/flags",
idempotent: true,
data: {
messages: JSON.stringify(msg_ids),
flag,
@@ -40,7 +39,6 @@ export const send_read = (function () {
channel.post({
url: "/json/messages/flags",
idempotent: true,
data: {messages: JSON.stringify(real_msg_ids_batch), op: "add", flag: "read"},
success: on_success,
});
@@ -140,7 +138,6 @@ export function unstar_all_messages_in_topic(stream_id, topic) {
channel.get({
url: "/json/messages",
data,
idempotent: true,
success(data) {
const messages = data.messages;
const starred_message_ids = messages.map((message) => message.id);

2
static/js/muted_topics_ui.js
View File

@@ -54,7 +54,6 @@ export function mute_topic(stream_id, topic, from_hotkey) {
channel.patch({
url: "/json/users/me/subscriptions/muted_topics",
idempotent: true,
data,
success() {
if (!from_hotkey) {
@@ -96,7 +95,6 @@ export function unmute_topic(stream_id, topic) {
channel.patch({
url: "/json/users/me/subscriptions/muted_topics",
idempotent: true,
data,
success() {
feedback_widget.dismiss();

2
static/js/muted_users_ui.js
View File

@@ -16,7 +16,6 @@ import * as settings_muted_users from "./settings_muted_users";
export function mute_user(user_id) {
channel.post({
url: "/json/users/me/muted_users/" + user_id,
idempotent: true,
});
}
@@ -40,7 +39,6 @@ export function confirm_mute_user(user_id) {
export function unmute_user(user_id) {
channel.del({
url: "/json/users/me/muted_users/" + user_id,
idempotent: true,
});
}

1
static/js/narrow.js
View File

@@ -353,7 +353,6 @@ export function activate(raw_operators, opts) {
// for it.
channel.get({
url: `/json/messages/${id_info.target_id}`,
idempotent: true,
success(data) {
// After the message is fetched, we make the
// message locally available and then call

1
static/js/popover_menus.js
View File

@@ -176,7 +176,6 @@ export function initialize() {
return channel.patch({
url: "/json/settings",
idempotent: true,
data: {enter_sends: selected_behaviour},
});
});

1
static/js/read_receipts.js
View File

@@ -20,7 +20,6 @@ export function show_user_list(message_id) {
loading.make_indicator($("#read_receipts_modal .loading_indicator"));
channel.get({
url: `/json/messages/${message_id}/read_receipts`,
idempotent: true,
success(data) {
const users = data.user_ids.map((id) => {
const user = people.get_by_user_id(id);

1
static/js/reminder.js
View File

@@ -125,7 +125,6 @@ export function do_set_reminder_for_message(message_id, timestamp) {
const msg_list = message_lists.current;
channel.get({
url: "/json/messages/" + message.id,
idempotent: true,
success(data) {
if (message_lists.current === msg_list) {
message.raw_content = data.raw_content;

1
static/js/server_events.js
View File

@@ -205,7 +205,6 @@ function get_events({dont_block = false} = {}) {
get_events_xhr = channel.get({
url: "/json/events",
data: get_events_params,
idempotent: true,
timeout: page_params.event_queue_longpoll_timeout_seconds * 1000,
success(data) {
watchdog.set_suspect_offline(false);

1
static/js/settings_bots.js
View File

@@ -556,7 +556,6 @@ export function set_up() {
const bot_id = Number.parseInt($(e.currentTarget).attr("data-user-id"), 10);
channel.post({
url: "/json/bots/" + encodeURIComponent(bot_id) + "/api_key/regenerate",
idempotent: true,
success(data) {
const $row = $(e.currentTarget).closest("li");
$row.find(".api_key").find(".value").text(data.api_key);

1
static/js/settings_invites.js
View File

@@ -168,7 +168,6 @@ export function set_up(initialize_event_handlers = true) {
// Populate invites table
channel.get({
url: "/json/invites",
idempotent: true,
timeout: 10 * 1000,
success(data) {
on_load_success(data, initialize_event_handlers);

1
static/js/settings_users.js
View File

@@ -431,7 +431,6 @@ export function confirm_deactivation(user_id, handle_confirm, loading_spinner) {
// request fails.
channel.get({
url: "/json/invites",
idempotent: true,
timeout: 10 * 1000,
success(data) {
let number_of_invites_by_user = 0;

1
static/js/stats/stats.js
View File

@@ -1041,7 +1041,6 @@ function get_chart_data(data, callback) {
$.get({
url: "/json/analytics/chart_data" + page_params.data_url_suffix,
data,
idempotent: true,
success(data) {
callback(data);
update_last_full_update(data.end_times);

3
static/js/unread_ops.js
View File

@@ -18,7 +18,6 @@ export function mark_all_as_read() {
channel.post({
url: "/json/mark_all_as_read",
idempotent: true,
success: () => {
// After marking all messages as read, we reload the browser.
// This is useful to avoid leaving ourselves deep in the past.
@@ -183,7 +182,6 @@ export function mark_current_list_as_read(options) {
export function mark_stream_as_read(stream_id, cont) {
channel.post({
url: "/json/mark_stream_as_read",
idempotent: true,
data: {stream_id},
success: cont,
});
@@ -192,7 +190,6 @@ export function mark_stream_as_read(stream_id, cont) {
export function mark_topic_as_read(stream_id, topic, cont) {
channel.post({
url: "/json/mark_topic_as_read",
idempotent: true,
data: {stream_id, topic_name: topic},
success: cont,
});

1
static/js/user_status.js
View File

@@ -17,7 +17,6 @@ export function server_update(opts) {
emoji_code: opts.emoji_code,
reaction_type: opts.reaction_type,
},
idempotent: true,
success() {
if (opts.success) {
opts.success();