Merge branch 'develop'

v2.4.16.3

Author: Marcin Przepiorowski

.github/workflows/build.yml

@@ -74,7 +74,7 @@ jobs:
 
   ubuntu:
     needs: [centos7]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
     - name: checkout dxtoolkit code
@@ -289,15 +289,21 @@ jobs:
         CELL=`brew --prefix perl`
         $CELL/bin/perl -MCPAN -e 'install App::cpanminus'
         brew install openssl@1.1
+<<<<<<< HEAD
         $CELL/bin/cpanm Crypt::CBC
         $CELL/bin/cpanm Crypt::Blowfish
+=======
+        cpanm Crypt::CBC@2.33
+        cpanm Crypt::Blowfish
+>>>>>>> develop
         export OPENSSL_PREFIX=`brew --prefix openssl@1.1`
         echo $OPENSSL_PREFIX
         export LIBS="-d=$OPENSSL_PREFIX"
         $CELL/bin/cpanm --configure-args=$LIBS Filter::Crypto::Decrypt
         $CELL/bin/cpanm JSON
         $CELL/bin/cpanm Date::Manip
         # force requires after 1/1/2020 ?
+<<<<<<< HEAD
         $CELL/bin/cpanm -f Date::Parse
         $CELL/bin/cpanm DateTime::Event::Cron::Quartz
         $CELL/bin/cpanm DateTime::Format::DateParse
@@ -312,6 +318,22 @@ jobs:
         $CELL/bin/cpanm utf8
         $CELL/bin/cpanm PAR::Packer
         $CELL/bin/cpanm List::MoreUtils::PP
+=======
+        cpanm -f Date::Parse
+        cpanm DateTime::Event::Cron::Quartz
+        cpanm DateTime::Format::DateParse
+        cpanm Text::CSV
+        cpanm LWP::UserAgent
+        cpanm Net::SSLeay
+        cpanm Mozilla::CA@20180117
+        cpanm -f IO::Socket::SSL@2.068
+        cpanm LWP::Protocol::https
+        cpanm Term::ReadKey
+        cpanm -f Archive::Zip
+        cpanm utf8
+        cpanm PAR::Packer
+        cpanm List::MoreUtils::PP
+>>>>>>> develop
 
     - name: Compile
       run: |

.github/workflows/develop.yml

@@ -82,7 +82,7 @@ jobs:
 
   ubuntu:
     needs: [centos7]
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
 
     steps:
     - name: checkout dxtoolkit code
@@ -331,7 +331,7 @@ jobs:
         # eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
         # echo $PERL_MB_OPT
         brew install openssl@1.1
-        $CELL/bin/cpanm Crypt::CBC
+        $CELL/bin/cpanm Crypt::CBC@2.33
         $CELL/bin/cpanm Crypt::Blowfish
         export OPENSSL_PREFIX=`brew --prefix openssl@1.1`
         echo $OPENSSL_PREFIX
@@ -347,7 +347,7 @@ jobs:
         $CELL/bin/cpanm LWP::UserAgent
         $CELL/bin/cpanm Net::SSLeay
         $CELL/bin/cpanm Mozilla::CA@20180117
-        $CELL/bin/cpanm IO::Socket::SSL@2.068
+        $CELL/bin/cpanm -f IO::Socket::SSL@2.068
         $CELL/bin/cpanm LWP::Protocol::https
         $CELL/bin/cpanm Term::ReadKey
         $CELL/bin/cpanm -f Archive::Zip

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 2.4.16.3
+
+### Changes
+
+- fix to disable debug data in various scripts
+- [bug #215](https://github.com/delphix/dxtoolkit/issues/215) - v2p for MS SQL fix for 6.0.14 and higher
 ## 2.4.16.2
 
 ### Added

bin/dx_ctl_snapshots.pl

@@ -87,7 +87,7 @@
 }
 
 my $w = ($retention =~ /^[[:digit:]]+$/);
-print Dumper !$w;
+#print Dumper !$w;
 
 
 

bin/dx_get_instance.pl

@@ -123,8 +123,8 @@
       next;
     }
 
-    print Dumper $dbobj->getDBType();
-    print Dumper $dbobj->getName();
+    #print Dumper $dbobj->getDBType();
+    #print Dumper $dbobj->getName();
 
 
     my $dbname = $dbobj->getName();
@@ -140,7 +140,7 @@
       $dbobj = $databases->getDB($contsource->{container});
     }
 
-    print Dumper $dbobj->getInstances();
+    #print Dumper $dbobj->getInstances();
 
     if ($dbobj->getInstances() eq 'UNKNOWN') {
       # Oracle is detached, so no information about instances, skip to next

lib/MSSQLVDB_obj.pm

@@ -319,7 +319,12 @@ sub setFileSystemLayout {
 
     logger($self->{_debug}, "Entering MSSQLVDB_obj::setFileSystemLayout",1);
 
-    $self->{"NEWDB"}->{"filesystemLayout"}->{"type"} = "TimeflowFilesystemLayout";
+    if (version->parse($self->{_dlpxObject}->getApi()) < version->parse(1.11.14)) {
+      # until 6.0.14
+      $self->{"NEWDB"}->{"filesystemLayout"}->{"type"} = "TimeflowFilesystemLayout";
+    } else {
+      $self->{"NEWDB"}->{"filesystemLayout"}->{"type"} = "MSSqlTimeflowFilesystemLayout";
+    }
 
     if (! defined($targetDirectory)) {
         return 1;

lib/Replication_obj.pm

@@ -266,7 +266,7 @@ sub getEnabled {
 
   my $ret;
 
-  print Dumper $replication->{$reference};
+  #print Dumper $replication->{$reference};
 
   if (version->parse($self->{_dlpxObject}->getApi()) < version->parse(1.9.0)) {
     $ret = $replication->{$reference}->{enabled} ? 'ENABLED' : 'DISABLED';

lib/Timeflow_obj.pm

@@ -513,6 +513,7 @@ sub finddSource
     logger($self->{_debug}, "Entering Timeflow_obj::finddSource",1);
 
     my $local_ref = $ref . "\@l";
+    my $parent_clean;
     my $child;
     my $parent;
 
@@ -532,12 +533,15 @@ sub finddSource
 
       logger($self->{_debug}, "Parent " . $parent . " for " . $local_ref, 2);
 
+
+      ($parent_clean) = $parent =~ /(.*)\@l/;
+
       if (($parent ne '') && ($parent ne 'deleted') && ($parent ne 'notlocal') ) {
           $child = $local_ref;
           $local_ref = $parent;
       }
 
-    } while (($parent ne '') && ($parent ne 'deleted') && ($parent ne 'notlocal'));
+    } while (($parent ne '') && ($parent ne 'deleted') && ($parent ne 'notlocal') && ($self->{_timeflows}->{$parent_clean}->{creationType} ne 'SOURCE_CONTINUITY' ) );
 
     if ($parent eq 'deleted') {
       $local_ref = 'deleted';

lib/Toolkit_helpers.pm

@@ -29,7 +29,7 @@ use File::Spec;
 
 use lib '../lib';
 
-our $version = '2.4.16.2';
+our $version = '2.4.16.3';
 
 my $tz = new Date::Manip::TZ;
 my $dt = new Date::Manip::Date;