Skip to content
This repository has been archived by the owner on Dec 4, 2023. It is now read-only.

feat: test python module locking #167

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

feat: test python module locking #167

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
226fcae
feat(lock): better error messages on failure
mkenigs Nov 20, 2023
261aeaf
feat: test python module locking
mkenigs Nov 20, 2023
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
9 changes: 6 additions & 3 deletions include/flox/resolver/environment.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,16 @@ namespace flox::resolver {

/* -------------------------------------------------------------------------- */

FLOX_DEFINE_EXCEPTION( ResolutionFailure,
FLOX_DEFINE_EXCEPTION( ResolutionFailureException,
EC_RESOLUTION_FAILURE,
"resolution failure" );


/* -------------------------------------------------------------------------- */

using ResolutionFailure = std::vector<std::pair<InstallID, std::string>>;
using ResolutionResult = std::variant<ResolutionFailure, SystemPackages>;

/**
* @brief A collection of data associated with an environment and its state.
*
Expand Down Expand Up @@ -172,7 +175,7 @@ private:
* @return `std::nullopt` if resolution fails, otherwise a set of
* resolved packages.
*/
[[nodiscard]] std::optional<SystemPackages>
[[nodiscard]] ResolutionResult
tryResolveGroup( const InstallDescriptors & group, const System & system );

/**
Expand All @@ -181,7 +184,7 @@ private:
* @return `std::nullopt` if resolution fails, otherwise a set of
* resolved packages for.
*/
[[nodiscard]] std::optional<SystemPackages>
[[nodiscard]] std::variant<InstallID, SystemPackages>
tryResolveGroupIn( const InstallDescriptors & group,
const pkgdb::PkgDbInput & input,
const System & system );
Expand Down
131 changes: 85 additions & 46 deletions src/resolver/environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,8 @@ Environment::getGroupInput( const InstallDescriptors & group,
{
if ( descriptor.group == oldDescriptor.group )
{
// TODO: check that input is still present in a
// registry somewhere?
return maybeLockedPackage->input;
}

Expand All @@ -431,16 +433,18 @@ Environment::getGroupInput( const InstallDescriptors & group,
}
}
}
// TODO: check that input is still present in a registry somewhere?
return wrongGroupInput;
}


/* -------------------------------------------------------------------------- */

std::optional<SystemPackages>
ResolutionResult
Environment::tryResolveGroup( const InstallDescriptors & group,
const System & system )
{
ResolutionFailure failure;
if ( auto oldLockfile = this->getOldLockfile(); oldLockfile.has_value() )
{
auto lockedInput
Expand All @@ -451,22 +455,54 @@ Environment::tryResolveGroup( const InstallDescriptors & group,
nix::ref<nix::Store> store = this->getStore();
pkgdb::PkgDbInput input( store, registryInput );
auto maybeResolved = this->tryResolveGroupIn( group, input, system );
if ( maybeResolved.has_value() ) { return maybeResolved; }
if ( const SystemPackages * resolved
= std::get_if<SystemPackages>( &maybeResolved ) )
{
return *resolved;
}
else if ( const InstallID * iid
= std::get_if<InstallID>( &maybeResolved ) )
{
failure.push_back( std::pair<InstallID, std::string> {
*iid,
input.getDbReadOnly()->lockedRef.string } );
}
else
{
throw ResolutionFailureException(
"we thought this was an unreachable error" );
}
}
}
// TODO: Use `getCombinedRegistryRaw()'
for ( const auto & [_, input] : *this->getPkgDbRegistry() )
{
auto maybeResolved = this->tryResolveGroupIn( group, *input, system );
if ( maybeResolved.has_value() ) { return maybeResolved; }
if ( const SystemPackages * resolved
= std::get_if<SystemPackages>( &maybeResolved ) )
{
return *resolved;
}
else if ( const InstallID * iid
= std::get_if<InstallID>( &maybeResolved ) )
{
failure.push_back( std::pair<InstallID, std::string> {
*iid,
input->getDbReadOnly()->lockedRef.string } );
}
else
{
throw ResolutionFailureException(
"we thought this was an unreachable error" );
}
}
return std::nullopt;
return failure;
}


/* -------------------------------------------------------------------------- */

std::optional<SystemPackages>
std::variant<InstallID, SystemPackages>
Environment::tryResolveGroupIn( const InstallDescriptors & group,
const pkgdb::PkgDbInput & input,
const System & system )
Expand All @@ -493,7 +529,7 @@ Environment::tryResolveGroupIn( const InstallDescriptors & group,
{
pkgRows.emplace( iid, maybeRow );
}
else { return std::nullopt; }
else { return iid; }
}

/* Convert to `LockedPackageRaw's */
Expand Down Expand Up @@ -530,50 +566,53 @@ Environment::lockSystem( const System & system )
auto groups = this->getUnlockedGroups( system );

/* Try resolving unresolved groups. */
std::vector<ResolutionFailure> failures;
std::stringstream msg;
msg << "failed to resolve some package(s):" << std::endl;
for ( auto group = groups.begin(); group != groups.end(); )
{
std::optional<SystemPackages> maybeResolved
= this->tryResolveGroup( *group, system );
if ( maybeResolved.has_value() )
{
pkgs.merge( *maybeResolved );
group = groups.erase( group );
}
else { ++group; }
}

if ( ! groups.empty() )
{
std::stringstream msg;
msg << "failed to resolve some packages(s):";
for ( const auto & group : groups )
{
// TODO tryResolveGroupIn should report which packages failed
// to resolve.
if ( auto descriptor = group.begin();
descriptor != group.end()
&& descriptor->second.group.has_value() )
{

msg << std::endl
<< " some package in group " << *descriptor->second.group
<< " failed to resolve: ";
}
else
{
msg << std::endl << " one of the following failed to resolve: ";
}
bool first = true;
for ( const auto & [iid, descriptor] : group )
{
if ( first ) { first = false; }
else { msg << ", "; }
msg << iid;
}
}
throw ResolutionFailure( msg.str() );
ResolutionResult maybeResolved = this->tryResolveGroup( *group, system );
std::visit(
overloaded {
/* Add to pkgs if the group was successfully resolved. */
[&]( SystemPackages & resolved )
{
pkgs.merge( resolved );
group = groups.erase( group );
},
/* Otherwise add a description of the resolution failure to msg. */
[&]( const ResolutionFailure & failure )
{
/* We should only hit this on the first iteration.
* TODO: throw sooner rather than trying to resolve every
* group? */
if ( failure.empty() )
{
throw ResolutionFailureException(
"no inputs found to search for packages" );
}
/* Print group name if this isn't the default group. */
if ( auto descriptor = group->begin();
descriptor != group->end()
&& descriptor->second.group.has_value() )
{

msg << " in group `" << *descriptor->second.group << "': ";
}
else { msg << " in default group:"; }
msg << std::endl;
for ( const auto & [iid, url] : failure )
{
msg << " failed to resolve `" << iid << "' in input `" << url
<< "'";
}

++group;
} },
maybeResolved );
}

if ( ! groups.empty() ) { throw ResolutionFailureException( msg.str() ); }

/* Copy over old lockfile entries we want to keep. */
if ( auto oldLockfile = this->getOldLockfile();
Expand Down
Loading
Loading