Quellcode durchsuchen

AMBARI-17387 Changing HDP repo URL does not leads to sending written URL to ambari-server while registering new HDP version (zhewang)

Zhe (Joe) Wang vor 9 Jahren
Ursprung
Commit
6e5422f62f

+ 8 - 1
ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js

@@ -332,7 +332,14 @@ angular.module('ambariAdminConsole')
               }));
               $location.path('/stackVersions');
             }).catch(function (data) {
-              Alert.error($t('versions.alerts.versionUpdateError'), data.message);
+              Stack.deleteRepo(versionInfo.stack_name, versionInfo.stack_version, versionInfo.id);
+              ConfirmationModal.show(
+                $t('versions.register.error.header'),
+                $t('versions.register.error.body'),
+                null,
+                null,
+                true
+              )
             });
           }
         })

+ 7 - 1
ambari-admin/src/main/resources/ui/admin-web/app/scripts/i18n.config.js

@@ -398,7 +398,13 @@ angular.module('ambariAdminConsole')
       'readInfo': 'Read Version Info',
       'browse': 'Browse',
       'installOn': 'Install on...',
-      'register': 'Register Version',
+      'register': {
+        'title': 'Register Version',
+        'error': {
+          'header': 'Unable to Register',
+          'body': 'You are attempting to register a version with a Base URL that is already in use with an existing registered version. You *must* review your Base URLs and confirm they are unique for the version you are trying to register.'
+        }
+      },
       'deregister': 'Deregister Version',
       'deregisterConfirmation': 'Are you sure you want to deregister version <strong>{{versionName}}</strong> ?',
       'placeholder': 'Version Number (0.0)',

+ 1 - 1
ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js

@@ -278,7 +278,7 @@ angular.module('ambariAdminConsole')
 
     postVersionDefinitionFile: function (isXMLdata, data, isDryRun) {
       var deferred = $q.defer(),
-        url = Settings.baseUrl + '/version_definitions' + (isDryRun ? '?dry_run=true' : ''),
+        url = Settings.baseUrl + '/version_definitions?skip_url_check=true' + (isDryRun ? '&dry_run=true' : ''),
         configs = isXMLdata? { headers: {'Content-Type': 'text/xml'}} : null;
 
       $http.post(url, data, configs)

+ 1 - 1
ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/list.html

@@ -24,7 +24,7 @@
     <div class="pull-right top-margin-4">
       <a href="#/stackVersions/create" class="btn btn-primary">
         <span class="glyphicon glyphicon-plus"></span>
-        {{'versions.register' | translate}}
+        {{'versions.register.title' | translate}}
       </a>
     </div>
   </div>

+ 1 - 1
ambari-admin/src/main/resources/ui/admin-web/app/views/stackVersions/stackVersionPage.html

@@ -21,7 +21,7 @@
     <li><a href="#/stackVersions">{{'common.versions' | translate}}</a></li>
     <li class="active" ng-if="editController">{{displayName}}&nbsp;<span
             class="sub-text">({{repoVersionFullName}})</span></li>
-    <li class="active" ng-if="createController">{{'versions.register' | translate}}</li>
+    <li class="active" ng-if="createController">{{'versions.register.title' | translate}}</li>
   </ol>
 
   <div class="pull-right deregister-button" ng-switch="deleteEnabled"  ng-if="editController">