Skip to content

fix(create): roll back only the database and user this create made #115

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

Merged
mrrobot47 merged 2 commits into from
Sep 28, 2026
Merged

fix(create): roll back only the database and user this create made #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f00188c
fix(create): roll back only the database and user this create made
mrrobot47 Sep 28, 2026
7ad0e99
fix(create): keep the rollback level and database flag right when a s…
mrrobot47 Sep 28, 2026
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
55 changes: 35 additions & 20 deletions src/PHP.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ class PHP extends EE_Site_Command {
*/
private $force;

/**
* @var bool $created_global_db Whether this run created the site's database and user on the global db.
*/
private $created_global_db = false;

public function __construct() {

parent::__construct();
Expand Down Expand Up @@ -242,6 +247,8 @@ public function create( $args, $assoc_args ) {
\EE::confirm( sprintf( 'EEv4 does not support PHP %s. Continue with PHP %s?', $old_version, $this->site_data['php_version'] ) );
}

\EE\Site\Utils\check_site_name_conflicts( $this->site_data['site_url'], $this->site_data['site_fs_path'] );

if ( $this->cache_type && ! $local_cache ) {
\EE\Service\Utils\init_global_container( GLOBAL_REDIS );
}
Expand All @@ -251,10 +258,7 @@ public function create( $args, $assoc_args ) {
$this->site_data['db_host'] = '';
if ( ! empty( $assoc_args['with-db'] ) ) {
$this->site_data['app_sub_type'] = 'mysql';
$this->site_data['db_name'] = \EE\Utils\get_flag_value( $assoc_args, 'dbname', str_replace( [
'.',
'-'
], '_', $this->site_data['site_url'] ) );
$this->site_data['db_name'] = \EE\Utils\get_flag_value( $assoc_args, 'dbname', \EE\Site\Utils\get_default_db_name( $this->site_data['site_url'] ) );
$this->site_data['db_host'] = \EE\Utils\get_flag_value( $assoc_args, 'dbhost', GLOBAL_DB );
$this->site_data['db_port'] = '3306';
$this->site_data['db_user'] = \EE\Utils\get_flag_value( $assoc_args, 'dbuser', $this->create_site_db_user( $this->site_data['site_url'] ) );
Expand All @@ -272,9 +276,11 @@ public function create( $args, $assoc_args ) {

if ( GLOBAL_DB === $this->site_data['db_host'] ) {
\EE\Service\Utils\init_global_container( GLOBAL_DB );
$this->site_data['db_name'] = \EE\Site\Utils\reserve_global_db_names( $this->site_data['db_name'], $this->site_data['db_user'], ! empty( $assoc_args['dbname'] ) );
try {
$user_data = \EE\Site\Utils\create_user_in_db( GLOBAL_DB, $this->site_data['db_name'], $this->site_data['db_user'], $this->site_data['db_password'] );
if ( ! $user_data ) {
// One statement: a signal is only handled after it, so rollback() always sees a created database.
$this->created_global_db = false !== ( $user_data = \EE\Site\Utils\create_user_in_db( GLOBAL_DB, $this->site_data['db_name'], $this->site_data['db_user'], $this->site_data['db_password'] ) );
if ( ! $this->created_global_db ) {
throw new \Exception( sprintf( 'Could not create user %s. Please check logs.', $this->site_data['db_user'] ) );
}
} catch ( \Exception $e ) {
Expand Down Expand Up @@ -792,12 +798,13 @@ private function maybe_verify_remote_db_connection() {
*/
private function create_site( $assoc_args ) {

$this->level = 1;
try {
if ( 'inherit' === $this->site_data['site_ssl'] ) {
$this->check_parent_site_certs( $this->site_data['site_url'] );
}

// Raised before the call: a signal during it is only handled once it returns.
$this->level = 1;
\EE\Site\Utils\create_site_root( $this->site_data['site_fs_path'], $this->site_data['site_url'] );
$this->level = 2;

Expand Down Expand Up @@ -950,6 +957,24 @@ public function reload( $args, $assoc_args, $whitelisted_containers = [], $reloa
}


/**
* Database and user a failed create may drop: only the ones this run created.
*
* @return array
*/
private function get_rollback_db_data() {

if ( ! $this->created_global_db ) {
return [];
}

return [
'db_host' => $this->site_data['db_host'],
'db_user' => $this->site_data['db_user'],
'db_name' => $this->site_data['db_name'],
];
}

/**
* Catch and clean exceptions.
*
Expand All @@ -959,12 +984,7 @@ private function catch_clean( $e ) {
\EE\Utils\delem_log( 'site cleanup start' );
\EE::warning( $e->getMessage() );
\EE::warning( 'Initiating clean-up.' );
$db_data = ( empty( $this->site_data['db_host'] ) || 'db' === $this->site_data['db_host'] ) ? [] : [
'db_host' => $this->site_data['db_host'],
'db_user' => $this->site_data['db_user'],
'db_name' => $this->site_data['db_name'],
];
$this->delete_site( $this->level, $this->site_data['site_url'], $this->site_data['site_fs_path'], $db_data );
$this->delete_site( $this->level, $this->site_data['site_url'], $this->site_data['site_fs_path'], $this->get_rollback_db_data() );
\EE\Utils\delem_log( 'site cleanup end' );
\EE::log( 'Report bugs here: https://github.com/EasyEngine/site-type-php' );
exit( 1 );
Expand All @@ -975,13 +995,8 @@ private function catch_clean( $e ) {
*/
protected function rollback() {
\EE::warning( 'Exiting gracefully after rolling back. This may take some time.' );
if ( $this->level > 0 ) {
$db_data = ( empty( $this->site_data['db_host'] ) || 'db' === $this->site_data['db_host'] ) ? [] : [
'db_host' => $this->site_data['db_host'],
'db_user' => $this->site_data['db_user'],
'db_name' => $this->site_data['db_name'],
];
$this->delete_site( $this->level, $this->site_data['site_url'], $this->site_data['site_fs_path'], $db_data );
if ( $this->level > 0 || $this->created_global_db ) {
$this->delete_site( $this->level, $this->site_data['site_url'], $this->site_data['site_fs_path'], $this->get_rollback_db_data() );
}
\EE::success( 'Rollback complete. Exiting now.' );
exit( 1 );
Expand Down
Loading