Compare commits

...

2 commits

Author SHA1 Message Date
c705a8f66e
Enable k2v feature flag in CI
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
continuous-integration/drone/tag Build is passing
continuous-integration/drone Build is passing
2022-07-18 12:19:18 +02:00
ac03fa7937
Uniformize tracing::* imports (hopefully fixes 32-bit build)
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone Build is passing
continuous-integration/drone/push Build is passing
2022-07-15 18:31:19 +02:00
5 changed files with 6 additions and 6 deletions

View file

@ -86,13 +86,14 @@ in let
It speeds up the compilation (when the feature is not required) and released crates have less dependency by default (less attack surface, disk space, etc.).
But we want to ship these additional features when we release Garage.
In the end, we chose to exclude all features from debug builds while putting (all of) them in the release builds.
Currently, the only feature of Garage is kubernetes-discovery from the garage_rpc crate.
Currently, the only such feature of Garage is kubernetes-discovery from the garage_rpc crate.
The experimental feature k2v is also enabled here in all builds.
*/
(pkgs.rustBuilder.rustLib.makeOverride {
name = "garage_rpc";
overrideArgs = old:
{
features = if release then [ "kubernetes-discovery" ] else [];
features = if release then [ "kubernetes-discovery" "k2v" ] else [ "k2v" ];
};
})
];

View file

@ -1,3 +1,6 @@
#[macro_use]
extern crate tracing;
pub mod lmdb_adapter;
pub mod sled_adapter;
pub mod sqlite_adapter;

View file

@ -345,7 +345,6 @@ pub fn recommended_map_size() -> usize {
#[cfg(target_pointer_width = "32")]
pub fn recommended_map_size() -> usize {
use log::warn;
warn!("LMDB is not recommended on 32-bit systems, database size will be limited");
1usize << 30
}

View file

@ -6,8 +6,6 @@ use std::pin::Pin;
use std::ptr::NonNull;
use std::sync::{Arc, Mutex, MutexGuard};
use tracing::trace;
use rusqlite::{params, Connection, Rows, Statement, Transaction};
use crate::{

View file

@ -9,7 +9,6 @@ use futures::StreamExt;
use serde::{Deserialize, Serialize};
use tokio::select;
use tokio::sync::{mpsc, watch};
use tracing::*;
use crate::background::WorkerInfo;
use crate::error::Error;