Upgrading deps, running clippy fix on nightly 1.55.0 #1638

dessalines · 2021-06-23T18:09:36Z

No description provided.

Nutomic · 2021-06-24T03:48:23Z

CI timed out on federation tests, I restarted it.

dessalines · 2021-06-24T15:32:48Z

@asonix I might need your help with this one, as upgrading your background_jobs library to 0.9.0 seems to crash the server now with the new actix and tokio versions. The crash happens when running background_jobs_actix::create_server which is necessary for the activitypub messages.

thread 'main' panicked at 'Arbiter is not running.', /home/xxx/.cargo/registry/src/github.com-1ecc6299db9ec823/actix-rt-2.2.0/src/arbiter.rs:187:21          [15/4815]
stack backtrace:                                                                                                                                                        
h   0: std::panicking::begin_panic                                                                                                                                      
   1: actix_rt::arbiter::Arbiter::current::{{closure}}                                                                                                                  
   2: std::thread::local::LocalKey<T>::try_with                                                                                                                         
   3: std::thread::local::LocalKey<T>::with                                                                                                                             
   4: actix_rt::arbiter::Arbiter::current                                                                                                                               
   5: background_jobs_actix::create_server                                                                                                                              
   6: lemmy_apub::activity_queue::create_activity_queue                                                                                                                 
   7: lemmy_server::main::{{closure}}                                                                                                                                   
   8: <core::future::from_generator::GenFuture<T> as core::future::future::Future>::poll                                                                                
   9: <tokio::task::local::RunUntil<T> as core::future::future::Future>::poll::{{closure}}::{{closure}}                                                                 
  10: tokio::coop::with_budget::{{closure}}                                                                                                                             
  11: std::thread::local::LocalKey<T>::try_with                                                                                                                         
  12: std::thread::local::LocalKey<T>::with                                                                                                                             
  13: <tokio::task::local::RunUntil<T> as core::future::future::Future>::poll::{{closure}}                                                                              
  14: tokio::macros::scoped_tls::ScopedKey<T>::set                                                                                        
  15: tokio::task::local::LocalSet::with                                                                                                  
  16: <tokio::task::local::RunUntil<T> as core::future::future::Future>::poll                                                             
  17: tokio::task::local::LocalSet::run_until::{{closure}}                                                                                
  18: <core::future::from_generator::GenFuture<T> as core::future::future::Future>::poll                                                  
  19: tokio::runtime::basic_scheduler::BasicScheduler<P>::block_on::{{closure}}::{{closure}}                                              
  20: tokio::coop::with_budget::{{closure}}                                                                                               
  21: std::thread::local::LocalKey<T>::try_with                                                                                           
  22: std::thread::local::LocalKey<T>::with                                                                                               
  23: tokio::runtime::basic_scheduler::BasicScheduler<P>::block_on::{{closure}}                                                           
  24: tokio::runtime::basic_scheduler::enter::{{closure}}         
  25: tokio::macros::scoped_tls::ScopedKey<T>::set                
  26: tokio::runtime::basic_scheduler::enter                                                                                              
  27: tokio::runtime::basic_scheduler::BasicScheduler<P>::block_on
  28: tokio::runtime::Runtime::block_on::{{closure}}
  29: tokio::runtime::context::enter                                                
  30: tokio::runtime::handle::Handle::enter                                         
  31: tokio::runtime::Runtime::block_on                                             
  32: tokio::task::local::LocalSet::block_on                                        
  33: actix_rt::runtime::Runtime::block_on                                          
  34: actix_rt::builder::SystemRunner::block_on                                     
  35: lemmy_server::main                  
  36: core::ops::function::FnOnce::call_once                                        
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.                                                                                 
Panic in Arbiter thread.

asonix · 2021-06-24T16:19:47Z

you can't upgraded to 0.9.0 without upgrading actix-web to the 4.0 betas. go back to the older version

asonix · 2021-06-24T16:21:03Z

oh wait, you did... i'll take a look

asonix · 2021-06-24T16:26:44Z

wait a sec, you upgraded tokio & actix-rt, but you didn't upgrade actix or actix-web, and you're using actix_web::main to start your runtime, which still starts an actix-rt 1 runtime

you gotta do a full upgrade or not at all

dessalines · 2021-06-24T18:50:29Z

Thx, I'll try this.

crates/utils/src/rate_limit/mod.rs

dessalines · 2021-07-05T19:41:54Z

@asonix , another issue, with the newest version of http-signature-normalization-actix:

https://github.com/lemmynet/lemmy/blob/upgrade_deps_4/crates/apub_receive/src/routes.rs#L78

error[E0277]: the trait bound `VerifyDigest<Sha256>: Transform<actix_web::scope::ScopeService, ServiceRequest>` is not satisfied
  --> crates/apub_receive/src/routes.rs:78:17
   |
78 |           .wrap(digest_verifier)
   |                 ^^^^^^^^^^^^^^^ the trait `Transform<actix_web::scope::ScopeService, ServiceRequest>` is not implemented for `VerifyDi
gest<Sha256>`

asonix · 2021-07-05T20:41:20Z

@dessalines update http-signature-normalization-actix to 0.5.0-beta.6

Nutomic · 2021-07-05T23:27:36Z

crates/routes/src/feeds.rs

  info: web::Query<Params>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse, Error> {
  let sort_type = get_sort_type(info).map_err(ErrorBadRequest)?;

+  let req_type: String = req.match_info().get("type").unwrap().parse().unwrap();
+  let param: String = req.match_info().get("name").unwrap().parse().unwrap();


Please handle this without unwrap.

Nutomic · 2021-07-06T00:31:28Z

crates/routes/src/feeds.rs

  info: web::Query<Params>,
  context: web::Data<LemmyContext>,
 ) -> Result<HttpResponse, Error> {
  let sort_type = get_sort_type(info).map_err(ErrorBadRequest)?;

+  let req_type: String = req.match_info().get("type").unwrap_or("none").parse()?;
+  let param: String = req.match_info().get("name").unwrap_or("none").parse()?;


Hmm that seems pretty much the same as before. Why did you remove the web::Path at all, did they remove that type?

Yep they removed that tuple and made it private.

* Upgrading deps, running clippy fix on nightly 1.55.0 * Running clippy --fix * Trying to fix transform * Trying to fix another transform * Upgrading http-signature-normalization-actix * Fix app_data * Fix pictrs uploading * Fix unwrap

Upgrading deps, running clippy fix on nightly 1.55.0

a4ca22f

dessalines requested a review from Nutomic June 23, 2021 18:09

dessalines added 3 commits July 3, 2021 20:05

Running clippy --fix

0a627af

Merge branch 'clippy_fix_1' into upgrade_deps_4

b6b4e10

Trying to fix transform

35bc999

dessalines changed the base branch from main to clippy_fix_1 July 4, 2021 23:21

dessalines commented Jul 4, 2021

View reviewed changes

crates/utils/src/rate_limit/mod.rs Outdated Show resolved Hide resolved

Trying to fix another transform

e40cd4b

dessalines added 3 commits July 5, 2021 16:47

Upgrading http-signature-normalization-actix

3f013fb

Fix app_data

acbc12a

Fix pictrs uploading

c4d3c78

dessalines changed the base branch from clippy_fix_1 to main July 5, 2021 22:30

Merge branch 'main' into upgrade_deps_4

97a9441

Nutomic reviewed Jul 5, 2021

View reviewed changes

Fix unwrap

2082442

dessalines requested a review from Nutomic July 6, 2021 00:05

Nutomic reviewed Jul 6, 2021

View reviewed changes

Nutomic merged commit 9840f5c into main Jul 6, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrading deps, running clippy fix on nightly 1.55.0 #1638

Upgrading deps, running clippy fix on nightly 1.55.0 #1638

dessalines commented Jun 23, 2021

Nutomic commented Jun 24, 2021

dessalines commented Jun 24, 2021

asonix commented Jun 24, 2021

asonix commented Jun 24, 2021

asonix commented Jun 24, 2021

dessalines commented Jun 24, 2021

dessalines commented Jul 5, 2021

asonix commented Jul 5, 2021

Nutomic Jul 5, 2021

dessalines Jul 6, 2021

Nutomic Jul 6, 2021 •

edited

Loading

dessalines Jul 6, 2021

Nutomic Jul 6, 2021

Upgrading deps, running clippy fix on nightly 1.55.0 #1638

Upgrading deps, running clippy fix on nightly 1.55.0 #1638

Conversation

dessalines commented Jun 23, 2021

Nutomic commented Jun 24, 2021

dessalines commented Jun 24, 2021

asonix commented Jun 24, 2021

asonix commented Jun 24, 2021

asonix commented Jun 24, 2021

dessalines commented Jun 24, 2021

dessalines commented Jul 5, 2021

asonix commented Jul 5, 2021

Nutomic Jul 5, 2021

Choose a reason for hiding this comment

dessalines Jul 6, 2021

Choose a reason for hiding this comment

Nutomic Jul 6, 2021 • edited Loading

Choose a reason for hiding this comment

dessalines Jul 6, 2021

Choose a reason for hiding this comment

Nutomic Jul 6, 2021

Choose a reason for hiding this comment

Nutomic Jul 6, 2021 •

edited

Loading