Browse Source

HUE-1038 [jobsub] Sample user created with wrong id

Examples in the jobsub and oozie apps should create a sample user
with the same ID. This ID should be 1100713.
Abraham Elmahrek 13 years ago
parent
commit
2050f32d4e

+ 1 - 1
apps/jobsub/src/jobsub/fixtures/example_data.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <django-objects version="1.0">
   <!-- Sample User -->
-  <object pk="1" model="auth.user">
+  <object pk="1100713" model="auth.user">
     <field type="CharField" name="username">sample</field>
     <field type="CharField" name="first_name"></field>
     <field type="CharField" name="last_name"></field>

+ 2 - 2
apps/jobsub/src/jobsub/management/commands/jobsub_setup.py

@@ -93,8 +93,8 @@ class Command(NoArgsCommand):
     try:
       sample_user.object = User.objects.get(username=sample_user.object.username)
     except User.DoesNotExist:
-      sample_user.object.pk = None
-      sample_user.object.id = None
+      sample_user.object.pk = 1100713
+      sample_user.object.id = 1100713
       sample_user.save()
 
     # Create the designs

+ 5 - 3
apps/oozie/src/oozie/management/commands/oozie_setup.py

@@ -21,6 +21,7 @@ import os
 from django.contrib.auth.models import User
 from django.core import management
 from django.core.management.base import NoArgsCommand
+from django.db import transaction
 from django.utils.translation import ugettext as _
 
 from hadoop import cluster
@@ -54,10 +55,11 @@ class Command(NoArgsCommand):
     fs.do_as_user(fs.DEFAULT_USER, fs.copyFromLocal, local_dir, remote_data_dir)
 
     # Load jobs
-    sample, created = User.objects.get_or_create(username='sample')
+    try:
+      sample_user = User.objects.get(pk=1100713)
+    except User.DoesNotExist:
+      sample_user = User.objects.create(username='sample', pk=1100713, id=1100713)
     management.call_command('loaddata', 'initial_oozie_examples.json', verbosity=2)
-    from oozie.models import Job
-    Job.objects.filter(owner__id=1100713).update(owner=sample) # 11OOZIE
 
 
 def create_directories(fs):