Skip to content

Option to do not output error on aggregation pipeline. #5672

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

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Option to do not output error on aggregation pipeline. #5672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee87f90
Option to do not output error on aggregation pipeline.
Cookiezaurs Oct 14, 2024
f48044c
Merge branch 'next' into anna/next
Cookiezaurs Oct 14, 2024
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
2 changes: 1 addition & 1 deletion bin/upgrade/24.10/scripts/merge_events_collections.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ async function merge_data_from_collection(countlyDB, collection, mapped, resolve
var app_id = mapped[collection].a;
var prefix = app_id + "_" + collection.replace("events", "");
var tscheck = Date.now().valueOf();
countlyDB.collection(collection).aggregate([{"$match": {"merged": {"$ne": true}}}, {"$addFields": {"_id": {"$concat": [prefix, "_", "$_id"]}, "tscheck": tscheck, "a": app_id, "e": mapped[collection].e}}, {"$merge": {"into": "events_data", "on": "_id", "whenMatched": "fail"}}], async function(err) {
countlyDB.collection(collection).aggregate([{"$match": {"merged": {"$ne": true}}}, {"$addFields": {"_id": {"$concat": [prefix, "_", "$_id"]}, "tscheck": tscheck, "a": app_id, "e": mapped[collection].e}}, {"$merge": {"into": "events_data", "on": "_id", "whenMatched": "fail"}}], {ignore_errors: [11000]}, async function(err) {
if (err) {
console.log("Failed to merge with database $merge operation. Doing each document one by one");

Expand Down
10 changes: 6 additions & 4 deletions plugins/pluginManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2569,10 +2569,12 @@ var pluginManager = function pluginManager() {
}
return function(err, res) {
if (err) {
logDbRead.e("Error reading " + collection + " %j %s %j", data, err, err);
logDbRead.d("From connection %j", countlyDb._cly_debug);
if (e) {
logDbRead.e(e.stack);
if (!(data && data.args && data.args[1] && data.args[1].ignore_errors && data.args[1].ignore_errors.indexOf(err.code) !== -1)) {
logDbRead.e("Error reading " + collection + " %j %s %j", data, err, err);
logDbRead.d("From connection %j", countlyDb._cly_debug);
if (e) {
logDbRead.e(e.stack);
}
}
}
if (callback) {
Expand Down
Loading