Skip to content

[IMP] use workDoneProgress to report loading progression and git lock… #454

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

Open
wants to merge 1 commit into
base: alpha
Choose a base branch
from
Open

[IMP] use workDoneProgress to report loading progression and git lock… #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 57 additions & 1 deletion server/src/core/odoo.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@ use std::ffi::OsStr;
use std::rc::{Rc, Weak};
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::Arc;
use std::time::Instant;
use std::time::{Duration, Instant};
use lsp_server::ResponseError;
use lsp_types::notification::{Notification, Progress};
use lsp_types::request::WorkDoneProgressCreate;
use lsp_types::*;
use request::{RegisterCapability, Request, WorkspaceConfiguration};
use serde_json::Value;
Expand Down Expand Up @@ -73,6 +75,7 @@ pub struct SyncOdoo {
pub main_entry_tree: Vec<OYarn>,
pub stubs_dirs: Vec<String>,
pub stdlib_dir: String,
pub progress_token: i32,
file_mgr: Rc<RefCell<FileMgr>>,
pub modules: HashMap<OYarn, Weak<RefCell<Symbol>>>,
pub models: HashMap<OYarn, Rc<RefCell<Model>>>,
Expand Down Expand Up @@ -110,6 +113,7 @@ impl SyncOdoo {
has_odoo_main_entry: false,
has_valid_python: false,
main_entry_tree: vec![],
progress_token: 0,
file_mgr: Rc::new(RefCell::new(FileMgr::new())),
stubs_dirs: SyncOdoo::default_stubs(),
stdlib_dir: SyncOdoo::default_stdlib(),
Expand Down Expand Up @@ -601,6 +605,22 @@ impl SyncOdoo {
session.sync_odoo.must_reload_paths.retain(|x| x.0.upgrade().is_some());
}

fn start_reporting(session: &mut SessionInfo) {
session.sync_odoo.progress_token += 1;
let _ = session.send_request::<WorkDoneProgressCreateParams, ()>(WorkDoneProgressCreate::METHOD, WorkDoneProgressCreateParams {
token: ProgressToken::Number(session.sync_odoo.progress_token)
});
session.send_notification(Progress::METHOD, ProgressParams {
token: ProgressToken::Number(session.sync_odoo.progress_token),
value: ProgressParamsValue::WorkDone(WorkDoneProgress::Begin(WorkDoneProgressBegin {
title: "Odoo: Indexing".to_string(),
cancellable: Some(false),
message: None,
percentage: None,
}))
});
}

pub fn process_rebuilds(session: &mut SessionInfo, no_validation: bool) -> bool {
session.sync_odoo.interrupt_rebuild.store(false, Ordering::SeqCst);
if session.sync_odoo.watched_file_updates > MAX_WATCHED_FILES_UPDATES_BEFORE_RESTART {
Expand All @@ -611,11 +631,31 @@ impl SyncOdoo {
let mut already_arch_rebuilt: HashSet<Tree> = HashSet::new();
let mut already_arch_eval_rebuilt: HashSet<Tree> = HashSet::new();
let mut already_validation_rebuilt: HashSet<Tree> = HashSet::new();

//workdone progress
let mut last_update_status = Instant::now() - Duration::from_secs(10);
let mut is_reporting_progress = false;
if !session.sync_odoo.rebuild_arch.is_empty() || !session.sync_odoo.rebuild_arch_eval.is_empty() || !session.sync_odoo.rebuild_validation.is_empty() {
is_reporting_progress = true;
SyncOdoo::start_reporting(session);
}
trace!("Starting rebuild: {:?} - {:?} - {:?}", session.sync_odoo.rebuild_arch.len(), session.sync_odoo.rebuild_arch_eval.len(), session.sync_odoo.rebuild_validation.len());
while !session.sync_odoo.need_rebuild && (!session.sync_odoo.rebuild_arch.is_empty() || !session.sync_odoo.rebuild_arch_eval.is_empty() || !session.sync_odoo.rebuild_validation.is_empty()) {
if DEBUG_THREADS {
trace!("remains: {:?} - {:?} - {:?}", session.sync_odoo.rebuild_arch.len(), session.sync_odoo.rebuild_arch_eval.len(), session.sync_odoo.rebuild_validation.len());
}
let queue_size = session.sync_odoo.rebuild_arch.len() * 3 + session.sync_odoo.rebuild_arch_eval.len() * 2 + session.sync_odoo.rebuild_validation.len();
if is_reporting_progress && (Instant::now() - last_update_status) > Duration::from_millis(200) {
last_update_status = Instant::now();
session.send_notification(Progress::METHOD, ProgressParams {
token: ProgressToken::Number(session.sync_odoo.progress_token),
value: ProgressParamsValue::WorkDone(WorkDoneProgress::Report(WorkDoneProgressReport {
cancellable: Some(false),
message: Some(format!("{} items remaining", queue_size)),
percentage: None,
}))
});
}
if session.sync_odoo.terminate_rebuild.load(Ordering::SeqCst){
info!("Terminating rebuilds due to server shutdown");
return false;
Expand Down Expand Up @@ -662,6 +702,14 @@ impl SyncOdoo {
if no_validation {
session.request_delayed_rebuild();
session.sync_odoo.add_to_validations(sym_rc.clone());
if is_reporting_progress {
session.send_notification(Progress::METHOD, ProgressParams {
token: ProgressToken::Number(session.sync_odoo.progress_token),
value: ProgressParamsValue::WorkDone(WorkDoneProgress::End(WorkDoneProgressEnd {
message: None,
}))
});
}
return true;
}
}
Expand All @@ -686,6 +734,14 @@ impl SyncOdoo {
}
session.sync_odoo.import_cache = None;
session.sync_odoo.watched_file_updates = 0;
if is_reporting_progress {
session.send_notification(Progress::METHOD, ProgressParams {
token: ProgressToken::Number(session.sync_odoo.progress_token),
value: ProgressParamsValue::WorkDone(WorkDoneProgress::End(WorkDoneProgressEnd {
message: None,
}))
});
}
trace!("Leaving rebuild with remaining tasks: {:?} - {:?} - {:?}", session.sync_odoo.rebuild_arch.len(), session.sync_odoo.rebuild_arch_eval.len(), session.sync_odoo.rebuild_validation.len());
true
}
Expand Down
29 changes: 26 additions & 3 deletions server/src/threads.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ pub enum DelayedProcessingMessage {
EXIT, //exit the thread
}

pub fn restart_server(sync_odoo: &Arc<Mutex<SyncOdoo>>, sender_session: &Sender<Message>, receiver_session: &Receiver<Message>, delayed_process_sender: &Sender<DelayedProcessingMessage>) {
fn restart_server(sync_odoo: &Arc<Mutex<SyncOdoo>>, sender_session: &Sender<Message>, receiver_session: &Receiver<Message>, delayed_process_sender: &Sender<DelayedProcessingMessage>) {
let message = "Too many requests, possible change of branch, restarting Odoo LS";
info!(message);
{
Expand All @@ -181,11 +181,25 @@ pub fn restart_server(sync_odoo: &Arc<Mutex<SyncOdoo>>, sender_session: &Sender<
noqas_stack: vec![],
current_noqa: NoqaInfo::None,
};
// Drain channel before resetting
session.send_notification("$Odoo/restartNeeded", ());
}
}

fn notify_git_lock(sync_odoo: &Arc<Mutex<SyncOdoo>>, sender_session: &Sender<Message>, receiver_session: &Receiver<Message>, delayed_process_sender: &Sender<DelayedProcessingMessage>, status: &str) {
{
let session = SessionInfo{
sender: sender_session.clone(),
receiver: receiver_session.clone(),
sync_odoo: &mut sync_odoo.lock().unwrap(),
delayed_process_sender: Some(delayed_process_sender.clone()),
noqas_stack: vec![],
current_noqa: NoqaInfo::None,
};
error!("Git index lock detected, notifying client: {}", status);
session.send_notification("$Odoo/loadingStatusUpdate", status);
}
}

pub fn delayed_changes_process_thread(sender_session: Sender<Message>, receiver_session: Receiver<Message>, receiver: Receiver<DelayedProcessingMessage>, sync_odoo: Arc<Mutex<SyncOdoo>>, delayed_process_sender: Sender<DelayedProcessingMessage>) {
const MAX_DELAY: u64 = 15000;
const MIN_DELAY: u64 = 1000;
Expand All @@ -199,11 +213,20 @@ pub fn delayed_changes_process_thread(sender_session: Sender<Message>, receiver_
// Check if immediate reaction is needed, else add the message to the list
match msg {
Ok(DelayedProcessingMessage::RESTART) => {
if let Some(main_entry_path) = sync_odoo.lock().unwrap().config.odoo_path.as_ref().cloned() {
let main_entry_path = sync_odoo.lock().unwrap().config.odoo_path.as_ref().cloned(); //avoid keeping lock
if let Some(main_entry_path) = main_entry_path {
let index_lock_path = PathBuf::from(main_entry_path).join(".git").join("index.lock");
let mut notified = false;
while index_lock_path.exists(){
if !notified {
notify_git_lock(&sync_odoo, &sender_session, &receiver_session, &delayed_process_sender, "git_locked");
notified = true;
}
std::thread::sleep(std::time::Duration::from_secs(1));
}
if notified {
notify_git_lock(&sync_odoo, &sender_session, &receiver_session, &delayed_process_sender, "stop");
}
}
if !waiting_restart {
waiting_restart = true;
Expand Down