Merge branch 'mmalvezz' into 'master'

Correct clone/create defect

See merge request rac-docker-dev/oracle-database-operator!237

Author: mmalvezz

controllers/database/pdb_controller.go

@@ -618,6 +618,18 @@ func (r *PDBReconciler) createPDB(ctx context.Context, req ctrl.Request, pdb *db
 		return err
 	}
 
+	/* Prevent creating an existing pdb */
+	err = r.getPDBState(ctx, req, pdb)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			log.Info("Check PDB not existence completed", "PDB Name", pdb.Spec.PDBName)
+		}
+
+	} else {
+		log.Info("Database already exists ", "PDB Name", pdb.Spec.PDBName)
+		return nil
+	}
+
 	values := map[string]string{
 		"method":              "CREATE",
 		"pdb_name":            pdb.Spec.PDBName,
@@ -679,6 +691,10 @@ func (r *PDBReconciler) createPDB(ctx context.Context, req ctrl.Request, pdb *db
  /************************************************/
 func (r *PDBReconciler) clonePDB(ctx context.Context, req ctrl.Request, pdb *dbapi.PDB) error {
 
+	if pdb.Spec.PDBName == pdb.Spec.SrcPDBName {
+		return nil
+	}
+
 	log := r.Log.WithValues("clonePDB", req.NamespacedName)
 
 	var err error
@@ -688,6 +704,18 @@ func (r *PDBReconciler) clonePDB(ctx context.Context, req ctrl.Request, pdb *dba
 		return err
 	}
 
+	/* Prevent cloning an existing pdb */
+	err = r.getPDBState(ctx, req, pdb)
+	if err != nil {
+		if apierrors.IsNotFound(err) {
+			log.Info("Check PDB not existence completed", "PDB Name", pdb.Spec.PDBName)
+		}
+
+	} else {
+		log.Info("Database already exists ", "PDB Name", pdb.Spec.PDBName)
+		return nil
+	}
+
 	values := map[string]string{
 		"method":           "CLONE",
 		"clonePDBName":     pdb.Spec.PDBName,