exmdb: let purge_softdelete EXRPC emit statistics

Transport statistical counts from purge_softdelete through the
network interface (adjusted EXRPC definition). Add printf in mbop to
print them.

References: GXL-497, DESK-1881

Author: JeremiaW

exch/exmdb/store2.cpp

@@ -303,7 +303,9 @@ static bool folder_purge_softdel(db_conn_ptr &db, cpid_t cpid,
  * @age:	soft-deleted items older than this age
  */
 BOOL exmdb_server::purge_softdelete(const char *dir, const char *username,
-    uint64_t folder_id, uint32_t del_flags, mapitime_t cutoff)
+    uint64_t folder_id, uint32_t del_flags, mapitime_t cutoff,
+    uint32_t *cnt_folders, uint32_t *cnt_messages,
+    uint64_t *sz_normal, uint64_t *sz_fai)
 {
 	del_flags &= DEL_FOLDERS;
 
@@ -359,6 +361,15 @@ BOOL exmdb_server::purge_softdelete(const char *dir, const char *username,
 	}
 	if (!cu_adjust_store_size(db->psqlite, ADJ_DECREASE, normal_size, fai_size))
 		return false;
+	char nbuf[32], fbuf[32];
+	HX_unit_size(nbuf, std::size(nbuf), normal_size + fai_size, 0, 0);
+	HX_unit_size(fbuf, std::size(fbuf), fai_size, 0, 0);
+	*cnt_messages = msg_count;
+	*cnt_folders  = fld_count;
+	*sz_normal    = normal_size;
+	*sz_fai       = fai_size;
+	mlog(LV_NOTICE, "I-2401: purge_softdelete %s: deleted %u messages, %u folders, reclaimed %sB (and %sB FAI)",
+		dir, msg_count, fld_count, nbuf, fbuf);
 	if (xact.commit() != SQLITE_OK)
 		return false;
 	dg_notify(std::move(notifq));

include/gromox/exmdb_idef.hpp

@@ -131,7 +131,7 @@ EXMIDL(vacuum, (const char *dir))
 EXMIDL(unload_store, (const char *dir))
 EXMIDL(notify_new_mail, (const char *dir, uint64_t folder_id, uint64_t message_id))
 EXMIDL(store_eid_to_user, (const char *dir, const STORE_ENTRYID *store_eid, IDLOUT char **maildir, unsigned int *user_id, unsigned int *domain_id))
-EXMIDL(purge_softdelete, (const char *dir, const char *username, uint64_t folder_id, uint32_t del_flags, gromox::mapitime_t cutoff))
+EXMIDL(purge_softdelete, (const char *dir, const char *username, uint64_t folder_id, uint32_t del_flags, gromox::mapitime_t cutoff, IDLOUT uint32_t *cnt_folders, uint32_t *cnt_messages, uint64_t *sz_normal, uint64_t *sz_fai))
 EXMIDL(purge_datafiles, (const char *dir))
 EXMIDL(autoreply_tsquery, (const char *dir, const char *peer, uint64_t window, IDLOUT uint64_t *tdiff))
 EXMIDL(autoreply_tsupdate, (const char *dir, const char *peer))

include/gromox/exmdb_rpc.hpp

@@ -1344,6 +1344,11 @@ struct exresp_imapfile_read final : public exresp {
 	std::string data;
 };
 
+struct exresp_purge_softdelete final : public exresp {
+	uint32_t cnt_folders = 0, cnt_messages = 0;
+	uint64_t sz_normal = 0, sz_fai = 0;
+};
+
 using exreq_ping_store = exreq;
 using exreq_get_all_named_propids = exreq;
 using exreq_get_store_all_proptags = exreq;
@@ -1381,7 +1386,7 @@ using exresp_vacuum = exresp;
 using exresp_unload_store = exresp;
 using exresp_ping_store = exresp;
 using exresp_notify_new_mail = exresp;
-using exresp_purge_softdelete = exresp;
+
 using exresp_purge_datafiles = exresp;
 using exresp_autoreply_tsupdate = exresp;
 using exresp_recalc_store_size = exresp;

lib/exmdb_ext.cpp

@@ -3722,6 +3722,22 @@ static pack_result exmdb_push(EXT_PUSH &x, const exresp_imapfile_read &d)
 	return x.p_bytes(d.data.data(), d.data.size());
 }
 
+static pack_result exmdb_pull(EXT_PULL &x, exresp_purge_softdelete &d)
+{
+	TRY(x.g_uint32(&d.cnt_folders));
+	TRY(x.g_uint32(&d.cnt_messages));
+	TRY(x.g_uint64(&d.sz_normal));
+	return x.g_uint64(&d.sz_fai);
+}
+
+static pack_result exmdb_push(EXT_PUSH &x, const exresp_purge_softdelete &d)
+{
+	TRY(x.p_uint32(d.cnt_folders));
+	TRY(x.p_uint32(d.cnt_messages));
+	TRY(x.p_uint64(d.sz_normal));
+	return x.p_uint64(d.sz_fai);
+}
+
 #define RSP_WITHOUT_ARGS \
 	E(ping_store) \
 	E(remove_store_properties) \
@@ -3751,7 +3767,6 @@ static pack_result exmdb_push(EXT_PUSH &x, const exresp_imapfile_read &d)
 	E(vacuum) \
 	E(unload_store) \
 	E(notify_new_mail) \
-	E(purge_softdelete) \
 	E(purge_datafiles) \
 	E(autoreply_tsupdate) \
 	E(recalc_store_size) \
@@ -3860,7 +3875,8 @@ static pack_result exmdb_push(EXT_PUSH &x, const exresp_imapfile_read &d)
 	E(autoreply_tsquery) \
 	E(imapfile_read) \
 	E(autoreply_getprop) \
-	E(autoreply_setprop)
+	E(autoreply_setprop) \
+	E(purge_softdelete)
 
 /* exmdb_callid::connect, exmdb_callid::listen_notification not included */
 /*

tools/mbop_purge.cpp

@@ -42,12 +42,21 @@ int main(int argc, char **argv)
 			return EXIT_FAILURE;
 		}
 		unsigned int flags = g_recursive ? DEL_FOLDERS : 0;
+		uint32_t st_folders = 0, st_messages = 0;
+		uint64_t sz_normal = 0, sz_fai = 0;
 		auto ok = exmdb_client->purge_softdelete(g_storedir, nullptr,
-		          eid, flags, age);
+		          eid, flags, age, &st_folders, &st_messages,
+		          &sz_normal, &sz_fai);
 		if (!ok) {
 			mbop_fprintf(stderr, "purge_softdel %s failed\n", *argv);
 			return EXIT_FAILURE;
 		}
+		char nbuf[32], fbuf[32];
+		HX_unit_size(nbuf, std::size(nbuf), sz_normal, 0, 0);
+		HX_unit_size(fbuf, std::size(fbuf), sz_fai,    0, 0);
+		printf("purge_softdelete: deleted %u messages, %u folders, reclaimed %sB (and %sB FAI)\n",
+			static_cast<unsigned int>(st_messages),
+			static_cast<unsigned int>(st_folders), nbuf, fbuf);
 	}
 	return EXIT_SUCCESS;
 }