Merge branch 'mssql_staging_push' into develop

Author: Marcin Przepiorowski

bin/dx_ctl_dsource.pl

@@ -84,6 +84,7 @@
   'presync=s@' =>\(my $presync),
   'postsync=s@' =>\(my $postsync),
   'hooks=s' => \(my $hooks),
+  'stagingpush' => \(my $stagingpush),
   'dever=s' => \(my $dever),
   'debug:n' => \(my $debug),
   'all' => (\my $all),
@@ -140,7 +141,15 @@
     exit (1);
   }
 
-  if ( ( lc $type ne 'db2' ) && ( ! ( defined($type) && defined($sourcename) && defined($dsourcename)  && defined($source_os_user) && defined($group) ) ) )  {
+
+  if (defined($stagingpush)) {
+    if (! defined($group)) {
+      print "For staging push -group is required. \n";
+      pod2usage(-verbose => 1,  -input=>\*DATA);
+      exit (1);
+    }
+  }
+  elsif ( ( lc $type ne 'db2' ) && ( ! ( defined($type) && defined($sourcename) && defined($dsourcename)  && defined($source_os_user) && defined($group) ) ) )  {
     print "Options -sourcename, -dsourcename, -group, -source_os_user are required. \n";
     pod2usage(-verbose => 1,  -input=>\*DATA);
     exit (1);
@@ -207,18 +216,20 @@
 
   if (((lc $action eq 'attach') || (lc $action eq 'create')) && (( lc $type ne 'db2' ) && ( lc $type ne 'vfiles' ) && (! ( defined($dbuser) && defined($password)  ) ) ) ) {
     # no db user exceptions
-    if (( lc $type eq 'mssql' ) && ( lc $dbusertype eq 'environment' ) )   {
-      $dbuser = $source_os_user;
-    } elsif (lc $type eq 'oracle') {
-        if ( ! (version->parse($engine_obj->getApi()) >= version->parse(1.11.7) ) ) {
-          print "Options -dbuser and -password are required for Oracle for version lower than 6.0.7 \n";
-          pod2usage(-verbose => 1,  -input=>\*DATA);
-          exit (1)
-        }
-    } else {
-      print "Options -dbuser and -password are required for non vFiles dsources. \n";
-      pod2usage(-verbose => 1,  -input=>\*DATA);
-      exit (1);
+    if (!defined($stagingpush)) {
+      if (( lc $type eq 'mssql' ) && ( lc $dbusertype eq 'environment' ) )   {
+        $dbuser = $source_os_user;
+      } elsif (lc $type eq 'oracle') {
+          if ( ! (version->parse($engine_obj->getApi()) >= version->parse(1.11.7) ) ) {
+            print "Options -dbuser and -password are required for Oracle for version lower than 6.0.7 \n";
+            pod2usage(-verbose => 1,  -input=>\*DATA);
+            exit (1)
+          }
+      } else {
+        print "Options -dbuser and -password are required for non vFiles dsources. \n";
+        pod2usage(-verbose => 1,  -input=>\*DATA);
+        exit (1);
+      }
     }
   }
 
@@ -308,9 +319,9 @@
     my $source = ($databases->getDB($source_ref->[0]));
 
     if ( $type eq 'oracle' ) {
-      $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$cdbcont);
+      $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$cdbcont, $stagingpush);
     } else {
-      $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$stageenv,$stageinst,$stage_os_user, $backup_dir, $validatedsync, $delphixmanaged, $compression, $dbusertype);
+      $jobno = $source->attach_dsource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$stageenv,$stageinst,$stage_os_user, $backup_dir, $validatedsync, $delphixmanaged, $compression, $dbusertype, $stagingpush);
     }
 
 
@@ -357,7 +368,7 @@
         $ret = $ret + 1;
         last;
       }
-      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync, $cdbcont);
+      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync, $cdbcont, $stagingpush);
     }
     elsif ($type eq 'sybase') {
       my $db = new SybaseVDB_obj($engine_obj,$debug);
@@ -373,7 +384,7 @@
         $ret = $ret + 1;
         last;
       }
-      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync,$stageenv,$stageinst,$stage_os_user, $backup_dir, $dumppwd, $validatedsync, $delphixmanaged, $compression, $dbusertype, \%commvault);
+      $jobno = $db->addSource($sourcename,$sourceinst,$sourceenv,$source_os_user,$dbuser,$password,$dsourcename,$group,$logsync,$stageenv,$stageinst,$stage_os_user, $backup_dir, $dumppwd, $validatedsync, $delphixmanaged, $compression, $dbusertype, \%commvault, $stagingpush);
     }
     elsif ($type eq 'vFiles') {
       my $db = new AppDataVDB_obj($engine_obj,$debug);
@@ -487,6 +498,7 @@ =head1 SYNOPSIS
                 [-hooks path_to_hooks]
                 [-presync [hookname,]template|filename[,OS_shell] ]
                 [-postsync [hookname,]template|filename[,OS_shell] ]
+                [-stagingpush]
                 [-debug ]
                 [-version ]
                 [-help|? ]
@@ -615,6 +627,9 @@ =head2 dSource arguments
 =item B<-commstagingclient Commvault staging name>
 Commvault staging name
 
+=item B<-stagingpush>
+Create dsource using staging push technology ( current support MS SQL )
+
 =item B<-hadr hadrPrimarySVC:XXX,hadrPrimaryHostname:hostname,hadrStandbySVC:YYY>
 Add DB2 dSource with HADR support
 Parameter hadrTargetList is optional.