v.2.4.19

Author: Marcin Przepiorowski

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 2.4.19
+
+### Changes:
+- [bug #227](https://github.com/delphix/dxtoolkit/issues/227) - snapshot order fixed
+- [bug #226](https://github.com/delphix/dxtoolkit/issues/226) - link / unlink (attach / detech) works for vPDB and CDB
+- build fixes
+
+### Added
+- [bug #225](https://github.com/delphix/dxtoolkit/issues/225) - support for vPDB/vCDB with TDE
+
+
 ## 2.4.18
 
 ### Added

bin/dx_ctl_dsource.pl

@@ -117,11 +117,11 @@
 
 if (! (($action eq 'detach') || ($action eq 'update')) )  {
 
-  if (defined($cdbcont) && ((!defined($cdbpass)) || (!defined($cdbuser)))) {
-    print "Option -cdbcont required a cdbpass and cdbuser to be defined \n";
-    pod2usage(-verbose => 1,  -input=>\*DATA);
-    exit (1);
-  }
+  # if (defined($cdbcont) && ((!defined($cdbpass)) || (!defined($cdbuser)))) {
+  #   print "Option -cdbcont required a cdbpass and cdbuser to be defined \n";
+  #   pod2usage(-verbose => 1,  -input=>\*DATA);
+  #   exit (1);
+  # }
 
   if (!defined($type)) {
     print "Option -type is required for this action \n";
@@ -237,7 +237,8 @@
       print "Source database not found.\n";
       $ret = $ret + 1;
       next;
-    }
+    } 
+
 
     for my $dbref (@{$source_ref}) {
 
@@ -307,7 +308,7 @@
     my $source = ($databases->getDB($source_ref->[0]));
 
     if ( $type eq 'oracle' ) {
-      $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$stageenv,$stageinst,$stage_os_user, $backup_dir);
+      $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$cdbcont);
     } else {
       $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$stageenv,$stageinst,$stage_os_user, $backup_dir, $validatedsync, $delphixmanaged, $compression, $dbusertype);
     }
@@ -345,7 +346,7 @@
     if ( $type eq 'oracle' ) {
       my $db = new OracleVDB_obj($engine_obj,$debug);
 
-      if (defined($cdbcont)) {
+      if (defined($cdbcont) && defined($cdbuser)) {
         if ($db->discoverPDB($sourceinst,$sourceenv,$cdbcont,$cdbuser,$cdbpass)) {
           print "There was an error with PDB discovery \n";
           $ret = $ret + 1;
@@ -356,7 +357,7 @@
         $ret = $ret + 1;
         last;
       }
-      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync);
+      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync, $cdbcont);
     }
     elsif ($type eq 'sybase') {
       my $db = new SybaseVDB_obj($engine_obj,$debug);
@@ -736,6 +737,15 @@ =head1 EXAMPLES
  Waiting for all actions to complete. Parent action is ACTION-12691
  Action completed with success
 
+
+Attach Oracle PDB dsource
+
+ dx_ctl_dsource -d Landshark5 -action attach -type oracle -sourcename PDB1 -source_os_user delphix  \
+                              -group Sources -dsourcename "PDB1" -cdbcont CDOML_A
+ Waiting for all actions to complete. Parent action is ACTION-1023
+ Action completed with success
+
+
 Adding an Oracle PDB dSource
 
  dx_ctl_dsource -d Landshark5 -action create -sourcename PDB1 -type oracle -sourceinst /u01/app/oracle/12.2.0.1/db1 \

bin/dx_provision_vdb.pl

@@ -112,6 +112,8 @@
   'vcdbuniqname=s' => \(my $vcdbuniqname),
   'vcdbinstname=s' => \(my $vcdbinstname),
   'vcdbtemplate=s' => \(my $vcdbtemplate),
+  'vdbtdepassword=s' => \(my $vdbtdepassword), 
+  'vcdbtdekeystore=s' => \(my $vcdbtdekeystore),
   'vcdbrac_instance=s@' => \(my $vcdbrac_instance),
   'customerenvfile=s@' => \(my $customerenvfile),
   'customerenvpair=s@' => \(my $customerenvpair),
@@ -593,7 +595,7 @@
 
 
     if (defined($vcdbname)) {
-      $db->setupVCDB($vcdbname,$vcdbgroup,$vcdbdbname,$vcdbinstname,$vcdbuniqname,$vcdbtemplate, $vcdbrac_instance);
+      $db->setupVCDB($vcdbname,$vcdbgroup,$vcdbdbname,$vcdbinstname,$vcdbuniqname,$vcdbtemplate, $vcdbrac_instance, $vdbtdepassword, $vcdbtdekeystore);
     }
 
 
@@ -767,6 +769,8 @@ =head1 SYNOPSIS
                   [-vcdbinstname vcdb_instance_name]
                   [-vcdbtemplate vcdb_template_name]
                   [-vcdbrac_instance env_node,instance_name,instance_no]
+                  [-vdbtdepassword vcdb_TDE_keystore_password]
+                  [-vcdbtdekeystore vcdb_TDE_keystore_location]
                   [-customerenvfile path_to_env_file[,nodename]]
                   [-customerenvpair key,value[,nodename]]
                   [-tdeparentpassword tde_parent_keystore_password
@@ -903,6 +907,12 @@ =head2 VDB arguments
 
 ex. -vcdbrac_instance node1,vCBD1,1 -vcdbrac_instance node2,vCBD2,2
 
+=item B<-vdbtdepassword vcdb_TDE_keystore_password>
+VCDB password for a new keystore
+
+=item B<-vcdbtdekeystore vcdb_TDE_keystore_location>
+VCDB location of the new keystore
+
 =item B<-noopen>
 Don't open database after provision (for Oracle)
 

lib/OracleVDB_obj.pm

@@ -145,14 +145,20 @@ sub getConfig
 
     my $config = '';
     my $joinsep;
+    my $vcdb;
+
+    if (!defined($self->{_databases}->{_vcdblist})) {
+      my %vcdblist;
+      $self->{_databases}->{_vcdblist} = \%vcdblist;
+    }
+
 
     if (defined($backup)) {
       $joinsep = ' ';
     } else {
       $joinsep = ',';
     }
 
-
     if ($self->getType() eq 'VDB') {
 
       my $mntpoint = $self->getMountPoint();
@@ -171,16 +177,17 @@ sub getConfig
 
         my $sourceobj = $self->{_source}->getSourceByConfig($cdbref);
 
-        if ($sourceobj->{type} eq 'OracleVirtualSource') {
+        if (($sourceobj->{type} eq 'OracleVirtualSource') && (! defined($self->{_databases}->{_vcdblist}->{$cdbref}))) {
             # this is a vCDB
+            # it is first time we see it 
+            $self->{_databases}->{_vcdblist}->{$cdbref} = 1;
 
             if (defined($sourceobj->{configTemplate})) {
               my $vcdbtempname = $templates->getTemplate($sourceobj->{configTemplate})->{name};
               $config = join($joinsep,($config, "-vcdbtemplate \"$vcdbtempname\""));
             }
 
 
-
             my $dbobj = $self->{_databases}->getDB($sourceobj->{container});
 
             if (defined($dbobj)) {
@@ -204,6 +211,17 @@ sub getConfig
                 }
               }
 
+              $vcdb = 1;
+
+              if (defined($dbobj->{sourceConfig}->{"tdeKeystorePassword"})) {
+                $config = join($joinsep,($config, "-vdbtdepassword xxxxxxxx"));
+              }
+
+
+              if (defined($self->{"source"}->{"targetVcdbTdeKeystorePath"})) {
+                $config = join($joinsep,($config, "-vcdbtdekeystore " . $self->{"source"}->{"targetVcdbTdeKeystorePath"}));
+              }
+
 
               $config = join($joinsep,($config, "-vcdbname $vcdbname -vcdbdbname $vcdbdbname -vcdbuniqname $vcdbuniqname -vcdbgroup \"$vcdbgroupname\""));
             } else {
@@ -264,7 +282,7 @@ sub getConfig
         $config = join($joinsep,($config, $cust));
       }
 
-      my $tde = $self->getTDE($joinsep);
+      my $tde = $self->getTDE($joinsep, $vcdb);
       if ($tde ne '') {
         $config = join($joinsep,($config, $tde));
       }
@@ -1599,6 +1617,55 @@ sub snapshot
     return $self->VDB_obj::snapshot(\%snapshot_type) ;
 }
 
+
+sub setConfig {
+    my $self = shift;
+    my $name = shift;
+    my $source_inst = shift;
+    my $source_env = shift;
+    my $cdbcont = shift;
+
+    logger($self->{_debug}, "Entering OracleVDB_obj::setConfig",1);
+
+    logger($self->{_debug}, "name: " . Dumper $name, 2);
+    logger($self->{_debug}, "source_inst: " . Dumper $source_inst, 2);
+    logger($self->{_debug}, "source_env: " . Dumper $source_env, 2);
+    logger($self->{_debug}, "cdbcont: " . Dumper $cdbcont, 2);
+    
+    
+    my $dlpxObject = $self->{_dlpxObject};
+    my $debug = $self->{_debug};
+
+    my $sourceconfig;
+
+
+    if (!defined($self->{_sourceconfig})) {
+        $sourceconfig = new SourceConfig_obj($dlpxObject, $debug);
+        $self->{_sourceconfig} = $sourceconfig;
+    }
+
+    my $ret;
+
+
+    if (defined($cdbcont)) {
+      my $container_obj = $self->{_sourceconfig}->getSourceConfigByName($cdbcont);
+      $ret = $self->{_sourceconfig}->getSourceByCDB($name, $container_obj->{reference});
+    } else {
+      my $sourceconfig_db = $self->{_sourceconfig}->getSourceConfigByName($name);
+      if ($sourceconfig_db->{"type"} ne 'OraclePDBConfig') {
+        if (!defined($sourceconfig_db)) {
+          print "Source database $name not found\n";
+        } else {
+          $ret = $sourceconfig_db;
+        }
+      } else {
+        print "Oracle PDB specified without CDB. Please add -cdbcont parameter\n";
+      }
+    }
+
+    return $ret
+}
+
 # Procedure attach_dsource
 # parameters:
 # - dbuser
@@ -1618,27 +1685,28 @@ sub attach_dsource
     my $source_osuser = shift;
     my $dbuser = shift;
     my $password = shift;
+    my $cdbcont = shift;
 
     logger($self->{_debug}, "Entering OracleVDB_obj::attach_dsource",1);
 
-    my $config = $self->setConfig($source, $source_inst, $source_env);
+    my $config = $self->setConfig($source, $source_inst, $source_env, $cdbcont);
 
     if (! defined($config)) {
-        print "Source database $source not found\n";
         return undef;
     }
 
-
     my $source_env_ref = $self->{_repository}->getEnvironment($config->{repository});
     my $source_os_ref = $self->{_environment}->getEnvironmentUserByName($source_env_ref,$source_osuser);
 
     my $authtype = $self->{_environment}->getEnvironmentUserAuth($source_env_ref, $source_os_ref);
 
     if ($authtype ne 'kerberos') {
       # assuming we have kerberos and no dbuser is enabled
-      if ($self->{_sourceconfig}->validateDBCredentials($config->{reference}, $dbuser, $password)) {
-          print "Username or password is invalid.\n";
-          return undef;
+      if (defined($dbuser)) {
+        if ($self->{_sourceconfig}->validateDBCredentials($config->{reference}, $dbuser, $password)) {
+            print "Username or password is invalid.\n";
+            return undef;
+        }
       }
     }
 
@@ -1697,26 +1765,32 @@ sub attach_dsource
           "attachData" => {
                 "type" => "OracleAttachData",
                 "config" => $config->{reference},
-                "oracleFallbackCredentials" => $password,
-                "oracleFallbackUser" => $dbuser,
                 "environmentUser" => $source_os_ref
           }
       );
+
+      if (defined($dbuser)) {
+        $attach_data{"attachData"}{"oracleFallbackUser"} = $dbuser;
+        $attach_data{"attachData"}{"oracleFallbackCredentials"} = $password;
+      }
+
     } else {
       # 6.0.4 and above so far
       %attach_data = (
           "type" => "AttachSourceParameters",
           "attachData" => {
                 "type" => "OracleAttachData",
                 "config" => $config->{reference},
-                "oracleFallbackCredentials" => {
-                    "type" => "PasswordCredential",
-                    "password" => $password
-                  },
-                "oracleFallbackUser" => $dbuser,
                 "environmentUser" => $source_os_ref
           }
       );
+
+      if (defined($dbuser)) {
+        $attach_data{"attachData"}{"oracleFallbackUser"} = $dbuser;
+        $attach_data{"attachData"}{"oracleFallbackCredentials"}{"type"} = "PasswordCredential";
+        $attach_data{"attachData"}{"oracleFallbackCredentials"}{"password"} = $password;
+      }
+
     }
 
     if ($config->{type} eq 'OraclePDBConfig') {
@@ -1909,11 +1983,12 @@ sub addSource {
     my $dsource_name = shift;
     my $group = shift;
     my $logsync = shift;
+    my $cdbcont = shift;
 
 
     logger($self->{_debug}, "Entering OracleVDB_obj::addSource",1);
 
-    my $config = $self->setConfig($source, $source_inst, $source_env);
+    my $config = $self->setConfig($source, $source_inst, $source_env, $cdbcont);
 
     if (! defined($config)) {
         print "Source database $source not found\n";
@@ -2274,6 +2349,8 @@ sub setupVCDB {
     my $vcdbuniqname = shift;
     my $vcdbtemplate = shift;
     my $vcdbrac_instance = shift;
+    my $vcdbtdepassword = shift;
+    my $vcdbtdekeystore = shift;
     logger($self->{_debug}, "Entering OracleVDB_obj::setupVCDB",1);
 
     $self->{_vcdbname} = $vcdbname;
@@ -2284,6 +2361,12 @@ sub setupVCDB {
     $self->{_vcdbtemplate} = $vcdbtemplate;
     $self->{_vcdbtemplate} = $vcdbtemplate;
     $self->{_vcdbrac_instance} = $vcdbrac_instance;
+
+    if (version->parse($self->{_dlpxObject}->getApi()) >= version->parse(1.11.18)) {
+      $self->{_vcdbtdepassword} = $vcdbtdepassword;
+      $self->{_vcdbtdekeystore} = $vcdbtdekeystore;
+    }
+
 }
 
 
@@ -2489,6 +2572,13 @@ sub createVDB {
           $virtcdbhash{"source"}{"configTemplate"} = $vcdbtemplateref;
         }
 
+
+        if (defined($self->{_vcdbtdepassword})) {
+          $self->{"NEWDB"}{"source"}{"targetVcdbTdeKeystorePath"} = $self->{_vcdbtdekeystore};
+          $virtcdbhash{"sourceConfig"}{"tdeKeystorePassword"} = $self->{_vcdbtdepassword};
+        }
+        
+
         $self->{"NEWDB"}->{"virtualCdb"} = \%virtcdbhash;
 
       }
@@ -2685,18 +2775,21 @@ sub setupTDE {
 sub getTDE {
     my $self = shift;
     my $separator = shift;
+    my $vcdb = shift;
     logger($self->{_debug}, "Entering OracleVDB_obj::getTDE",1);
     my $ret = '';
     if (defined($self->{"source"}->{"parentTdeKeystorePath"})) {
        $ret = " -tdeparentpath " . $self->{"source"}->{"parentTdeKeystorePath"};
-       $ret = $ret . " -tdeparentpassword xxxxxx -tdeexportsecret xxxxxxx -tdecdbpassword xxxxxxx";
+       $ret = $ret . " -tdeparentpassword xxxxxx -tdeexportsecret xxxxxxx ";
+       if (defined($vcdb)) {
+       } else {
+        $ret = $ret . "-tdecdbpassword xxxxxxx";
+       }
        if (defined($self->{"source"}->{"tdeKeyIdentifier"})) {
          $ret = $ret . " -tdekeyid " . $self->{"source"}->{"tdeKeyIdentifier"};
        }
     }
 
-
-
     return $ret;
 }